d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

routing: always pass rtentry to add_route_flags().

Browse Source 
add_route_flags() uses `rt` prefix data to lookup the the current
 rtentry from the routing table. Update rib_add_route_px() to
 always pass rtentry regardless of the op_flags.

Reported by:	Stefan Grundmann <sg2342@googlemail.com>
MFC after:	1 day
This commit is contained in:
Alexander V. Chernikov 2023-02-17 17:20:38 +00:00
parent cda6bdbaa1
commit a0aa160b6d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/route/route_ctl.c
View File

@ -455,7 +455,7 @@ fill_pxmask_family(int family, int plen, struct sockaddr *_dst,
* Attempts to add @dst/plen prefix with nexthop/nexhopgroup data @rnd
* to the routing table.
*
* @fibnum: rtable id to insert route to
* @fibnum: verified kernel rtable id to insert route to
* @dst: verified kernel-originated sockaddr, can be masked if plen non-empty
* @plen: prefix length (or -1 if host route or not applicable for AF)
* @op_flags: combination of RTM_F_ flags
@ -490,6 +490,16 @@ rib_add_route_px(uint32_t fibnum, struct sockaddr *dst, int plen,
FIB_RH_LOG(LOG_INFO, rnh, "rtentry allocation failed");
return (ENOMEM);
}
} else {
struct route_nhop_data rnd_tmp;
RIB_RLOCK_TRACKER;
RIB_RLOCK(rnh);
rt = lookup_prefix_bysa(rnh, dst, netmask, &rnd_tmp);
RIB_RUNLOCK(rnh);
if (rt == NULL)
return (ESRCH);
}
return (add_route_flags(rnh, rt, rnd, op_flags, rc));
@ -766,6 +776,8 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data
struct rtentry *rt_orig;
int error = 0;
MPASS(rt != NULL);
nh = rnd_add->rnd_nhop;
RIB_WLOCK(rnh);