aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6/frag6.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-06-23 20:19:09 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-06-23 20:19:09 +0000
commit8c0fec805f76bef04e007ca08552bd80ab64daf9 (patch)
tree5ce1a7dad67026f119a839b3325454ebafa72c51 /sys/netinet6/frag6.c
parentabcd328be6335621a1152ed2ce08b4550ab4242c (diff)
downloadsrc-8c0fec805f76bef04e007ca08552bd80ab64daf9.tar.gz
src-8c0fec805f76bef04e007ca08552bd80ab64daf9.zip
Modify most routines returning 'struct ifaddr *' to return references
rather than pointers, requiring callers to properly dispose of those references. The following routines now return references: ifaddr_byindex ifa_ifwithaddr ifa_ifwithbroadaddr ifa_ifwithdstaddr ifa_ifwithnet ifaof_ifpforaddr ifa_ifwithroute ifa_ifwithroute_fib rt_getifa rt_getifa_fib IFP_TO_IA ip_rtaddr in6_ifawithifp in6ifa_ifpforlinklocal in6ifa_ifpwithaddr in6_ifadd carp_iamatch6 ip6_getdstifaddr Remove unused macro which didn't have required referencing: IFP_TO_IA6 This closes many small races in which changes to interface or address lists while an ifaddr was in use could lead to use of freed memory (etc). In a few cases, add missing if_addr_list locking required to safely acquire references. Because of a lack of deep copying support, we accept a race in which an in6_ifaddr pointed to by mbuf tags and extracted with ip6_getdstifaddr() doesn't hold a reference while in transmit. Once we have mbuf tag deep copy support, this can be fixed. Reviewed by: bz Obtained from: Apple, Inc. (portions) MFC after: 6 weeks (portions)
Notes
Notes: svn path=/head/; revision=194760
Diffstat (limited to 'sys/netinet6/frag6.c')
-rw-r--r--sys/netinet6/frag6.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 2f4e256f1b59..3f57802528d9 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -185,8 +185,10 @@ frag6_input(struct mbuf **mp, int *offp, int proto)
dstifp = NULL;
#ifdef IN6_IFSTAT_STRICT
/* find the destination interface of the packet. */
- if ((ia = ip6_getdstifaddr(m)) != NULL)
+ if ((ia = ip6_getdstifaddr(m)) != NULL) {
dstifp = ia->ia_ifp;
+ ifa_free(&ia->ia_ifa);
+ }
#else
/* we are violating the spec, this is not the destination interface */
if ((m->m_flags & M_PKTHDR) != 0)