The branch releng/13.2 has been updated by melifaro:
URL:
https://cgit.FreeBSD.org/src/commit/?id=16d16c4fcd72f8ce86fce64eb10a4a466c46b8e0
commit 16d16c4fcd72f8ce86fce64eb10a4a466c46b8e0
Author: Alexander V. Chernikov <melif...@freebsd.org>
AuthorDate: 2023-02-17 17:20:38 +0000
Commit: Alexander V. Chernikov <melif...@freebsd.org>
CommitDate: 2023-02-20 19:48:31 +0000
routing: always pass rtentry to add_route_flags().
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 <sg2...@googlemail.com>
Approved by: re(cperciva)
MFC after: 1 day
(cherry picked from commit a0aa160b6d261f67b29a25c7cc5e04668fb6faf7)
(cherry picked from commit 45ced2987df29a8587df2ad3c9ea0ddb1998aa16)
---
sys/net/route/route_ctl.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c
index eaabe901b3cb..9bb02c99ddce 100644
--- a/sys/net/route/route_ctl.c
+++ b/sys/net/route/route_ctl.c
@@ -454,7 +454,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
@@ -489,6 +489,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));
@@ -765,6 +775,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);
