The branch stable/13 has been updated by melifaro:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3d851bd036986cab15650fff33185a0fb42d634f
commit 3d851bd036986cab15650fff33185a0fb42d634f
Author: Alexander V. Chernikov <melif...@freebsd.org>
AuthorDate: 2021-04-05 19:58:57 +0000
Commit: Alexander V. Chernikov <melif...@freebsd.org>
CommitDate: 2021-04-29 08:47:31 +0000
Always use inp fib in the inp_lookup_mcast_ifp().
inp_lookup_mcast_ifp() is static and is only used in the inp_join_group().
The latter function is also static, and is only used in the
inp_setmoptions(),
which relies on inp being non-NULL.
As a result, in the current code, inp_lookup_mcast_ifp() is always called
with non-NULL inp. Eliminate unused RT_DEFAULT_FIB condition and always
use inp fib instead.
Differential Revision: https://reviews.freebsd.org/D29594
Reviewed by: kp
MFC after: 2 weeks
(cherry picked from commit c3a456defaf28df8d6f47704d606248f6c22146c)
---
sys/netinet/in_mcast.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 6d390a0b263c..46658688bbc2 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -1894,8 +1894,7 @@ inp_getmoptions(struct inpcb *inp, struct sockopt *sopt)
* specific physical links in the networking stack, or which need
* to join link-scope groups before IPv4 addresses are configured.
*
- * If inp is non-NULL, use this socket's current FIB number for any
- * required FIB lookup.
+ * Use this socket's current FIB number for any required FIB lookup.
* If ina is INADDR_ANY, look up the group address in the unicast FIB,
* and use its ifp; usually, this points to the default next-hop.
*
@@ -1916,8 +1915,8 @@ inp_lookup_mcast_ifp(const struct inpcb *inp,
struct rm_priotracker in_ifa_tracker;
struct ifnet *ifp;
struct nhop_object *nh;
- uint32_t fibnum;
+ KASSERT(inp != NULL, ("%s: inp must not be NULL", __func__));
KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__));
KASSERT(IN_MULTICAST(ntohl(gsin->sin_addr.s_addr)),
("%s: not multicast", __func__));
@@ -1930,8 +1929,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp,
if_ref(ifp);
IN_IFADDR_RUNLOCK(&in_ifa_tracker);
} else {
- fibnum = inp ? inp->inp_inc.inc_fibnum : RT_DEFAULT_FIB;
- nh = fib4_lookup(fibnum, gsin->sin_addr, 0, NHR_NONE, 0);
+ nh = fib4_lookup(inp->inp_inc.inc_fibnum, gsin->sin_addr, 0,
NHR_NONE, 0);
if (nh != NULL) {
ifp = nh->nh_ifp;
if_ref(ifp);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
