diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2021-08-05 08:51:46 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2021-08-13 07:31:11 +0000 |
| commit | 40ec2323e689e2b9bcede8e2f217b689e64f621f (patch) | |
| tree | 333c95b9297229a5fead58205030d88057f3eecd | |
| parent | 7eb023696a7db1d66a811756b81e0cc7d617cc23 (diff) | |
| download | src-40ec2323e689e2b9bcede8e2f217b689e64f621f.tar.gz src-40ec2323e689e2b9bcede8e2f217b689e64f621f.zip | |
Fix panic in IPv6 multicast code.
Add check that ifp supports IPv6 multicasts in in6_getmulti.
This fixes panic when user application tries to join into multicast
group on an interface that doesn't support IPv6 multicasts, like
IFT_PFLOG interfaces.
PR: 257302
Reviewed by: melifaro
Differential Revision: https://reviews.freebsd.org/D31420
(cherry picked from commit d477a7feed177d0ad5c12bc6e2cce804d427ed38)
| -rw-r--r-- | sys/netinet6/in6_mcast.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index 0744a1178fc7..7326befc6d01 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -374,9 +374,18 @@ in6_getmulti(struct ifnet *ifp, const struct in6_addr *group, IN6_MULTI_LIST_LOCK(); IF_ADDR_WLOCK(ifp); NET_EPOCH_ENTER(et); - inm = in6m_lookup_locked(ifp, group); + /* + * Does ifp support IPv6 multicasts? + */ + if (ifp->if_afdata[AF_INET6] == NULL) + error = ENODEV; + else + inm = in6m_lookup_locked(ifp, group); NET_EPOCH_EXIT(et); + if (error != 0) + goto out_locked; + if (inm != NULL) { /* * If we already joined this group, just bump the |