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

Ok jhb, lets move the ifa_free() down to the bottom to

Browse Source 
assure that *all* tables and such are removed before
we start to free. This won't protect the Hash in ip_input.c
but in theory should protect any other uses that *do* use locks.

MFC after:	1 week (or more)
This commit is contained in:
Randall Stewart 2012-08-17 05:51:46 +00:00
parent f274a47134
commit 9424879158
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet/in.c
View File

@ -573,7 +573,6 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
} }
TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link); TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
IF_ADDR_WUNLOCK(ifp); IF_ADDR_WUNLOCK(ifp);
/* ifa_free(&ia->ia_ifa); - Double free?? */ /* if_addrhead */
IN_IFADDR_WLOCK(); IN_IFADDR_WLOCK();
TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link); TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link);
@ -597,6 +596,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
} else } else
ifa_free(&iap->ia_ifa); ifa_free(&iap->ia_ifa);
ifa_free(&ia->ia_ifa); /* if_addrhead */
ifa_free(&ia->ia_ifa); /* in_ifaddrhead */ ifa_free(&ia->ia_ifa); /* in_ifaddrhead */
out: out:
if (ia != NULL) if (ia != NULL)