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

Free mbuf in case when protocol in unknown in ng_ipfw_rcvdata().

Browse Source 
This change fixes (theoretically) possible mbuf leak introduced in
r225586. Reorder code a bit and change return codes to be more specific

Reviewed by:	glebius
Approved by:    kib (mentor)
This commit is contained in:
Alexander V. Chernikov 2011-10-10 09:33:07 +00:00
parent e275052c56
commit 7aabe9d9e0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=226186
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netgraph/ng_ipfw.c
View File

@ -242,7 +242,7 @@ ng_ipfw_rcvdata(hook_p hook, item_p item)
if (m->m_len < sizeof(struct ip) &&
(m = m_pullup(m, sizeof(struct ip))) == NULL)
return (EINVAL);
return (ENOBUFS);
ip = mtod(m, struct ip *);
@ -252,18 +252,14 @@ ng_ipfw_rcvdata(hook_p hook, item_p item)
#ifdef INET
case IPVERSION:
ip_input(m);
break;
return (0);
#endif
#ifdef INET6
case IPV6_VERSION >> 4:
ip6_input(m);
break;
return (0);
#endif
default:
NG_FREE_M(m);
return (EINVAL);
}
return (0);
} else {
switch (ip->ip_v) {
#ifdef INET
@ -277,10 +273,12 @@ ng_ipfw_rcvdata(hook_p hook, item_p item)
return (ip6_output(m, NULL, NULL, 0, NULL,
NULL, NULL));
#endif
default:
return (EINVAL);
}
}
/* unknown IP protocol version */
NG_FREE_M(m);
return (EPROTONOSUPPORT);
}
static int