Author: eugen
Date: Sat Oct 27 04:45:28 2018
New Revision: 339806
URL: https://svnweb.freebsd.org/changeset/base/339806

Log:
  Prevent stf(4) from panicing due to unprotected access to INADDR_HASH.
  
  PR:                   220078
  MFC after:            1 month
  Differential Revision:        https://reviews.freebsd.org/D12457
  Tested-by:            Cassiano Peixoto and others

Modified:
  head/sys/net/if_stf.c

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c       Sat Oct 27 04:10:42 2018        (r339805)
+++ head/sys/net/if_stf.c       Sat Oct 27 04:45:28 2018        (r339806)
@@ -367,6 +367,7 @@ stf_encapcheck(const struct mbuf *m, int off, int prot
 static int
 stf_getsrcifa6(struct ifnet *ifp, struct in6_addr *addr, struct in6_addr *mask)
 {
+       struct rm_priotracker in_ifa_tracker;
        struct ifaddr *ia;
        struct in_ifaddr *ia4;
        struct in6_ifaddr *ia6;
@@ -382,9 +383,11 @@ stf_getsrcifa6(struct ifnet *ifp, struct in6_addr *add
                        continue;
 
                bcopy(GET_V4(&sin6->sin6_addr), &in, sizeof(in));
+               IN_IFADDR_RLOCK(&in_ifa_tracker);
                LIST_FOREACH(ia4, INADDR_HASH(in.s_addr), ia_hash)
                        if (ia4->ia_addr.sin_addr.s_addr == in.s_addr)
                                break;
+               IN_IFADDR_RUNLOCK(&in_ifa_tracker);
                if (ia4 == NULL)
                        continue;
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to