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

In divert_packet(), lock the interface address list before iterating over

Browse Source 
it in search of an address.

MFC after:	2 weeks
This commit is contained in:
Robert Watson 2009-04-19 22:29:16 +00:00
parent 9317b04e46
commit b132600ab2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netinet/ip_divert.c
View File

@ -244,18 +244,22 @@ divert_packet(struct mbuf *m, int incoming)
divsrc.sin_port = divert_cookie(mtag); /* record matching rule */
if (incoming) {
struct ifaddr *ifa;
struct ifnet *ifp;
/* Sanity check */
M_ASSERTPKTHDR(m);
/* Find IP address for receive interface */
TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrhead, ifa_link) {
ifp = m->m_pkthdr.rcvif;
IF_ADDR_LOCK(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET)
continue;
divsrc.sin_addr =
((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
break;
}
IF_ADDR_UNLOCK(ifp);
}
/*
* Record the incoming interface name whenever we have one.