diff options
author | rwatson <rwatson@FreeBSD.org> | 2009-06-25 08:37:38 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2009-06-25 08:37:38 +0000 |
commit | 4cf6a458ca11df1df230a7c76e0ea742011bd2b0 (patch) | |
tree | 3c07855759771ed0cdcac63c28b8d62cc832cdeb /sys/netinet6 | |
parent | 3ef00864f7ddb667e4ff27445a2a4a4642fc24de (diff) | |
download | FreeBSD-src-4cf6a458ca11df1df230a7c76e0ea742011bd2b0.zip FreeBSD-src-4cf6a458ca11df1df230a7c76e0ea742011bd2b0.tar.gz |
Clean up reference management in in6_update_ifa and in6_unlink_ifa, and
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
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/in6.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 9ad447e..b280e89 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -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); } |