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

Clean up reference management in in6_update_ifa and in6_unlink_ifa, and

Browse Source 
in particular, add a reference for in6_ifaddrhead since we do remove a
reference for it when an IPv6 address is removed.  This fixes ifconfig
delete of an IPv6 alias.

Reported by:	tegge
MFC after:	6 weeks
This commit is contained in:
Robert Watson 2009-06-25 08:37:38 +00:00
parent d4b9a71c71
commit 3cfed08d1d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet6/in6.c
View File

@ -831,6 +831,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
TAILQ_INSERT_TAIL(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
IF_ADDR_UNLOCK(ifp);
ifa_ref(&ia->ia_ifa); /* in6_if_addrhead */
TAILQ_INSERT_TAIL(&V_in6_ifaddrhead, ia, ia_link);
}
@ -1147,8 +1148,8 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
* anyway.
*/
if (hostIsNew) {
ifa_free(&ia->ia_ifa);
in6_unlink_ifa(ia, ifp);
ifa_free(&ia->ia_ifa);
}
return (error);
@ -1376,6 +1377,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp)
ifa_free(&ia->ia_ifa); /* if_addrhead */
TAILQ_REMOVE(&V_in6_ifaddrhead, ia, ia_link);
ifa_free(&ia->ia_ifa); /* in6_ifaddrhead */
/*
* Release the reference to the base prefix. There should be a
@ -1399,12 +1401,6 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp)
pfxlist_onlink_check();
}
/*
* release another refcnt for the link from in6_ifaddr.
* Note that we should decrement the refcnt at least once for all *BSD.
*/
ifa_free(&ia->ia_ifa);
splx(s);
}