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

- Fix potential double mbuf free: M_PREPEND may free mbuf chain and return

Browse Source 
NULL but item will still have the reference ot the mbuf chain and will free
it upon destruction.
- Fix memory leak (unfree'd item on error path).
This commit is contained in:
Max Khon 2011-11-06 05:24:54 +00:00
parent 6812e78328
commit 4cf39b5da4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netgraph/ng_atmllc.c
View File

@ -153,7 +153,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p item)
int error; int error;
priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
m = NGI_M(item); NGI_GET_M(item, m);
outhook = NULL; outhook = NULL;
padding = 0; padding = 0;
@ -170,6 +170,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p item)
if (m->m_len < sizeof(struct atmllc) + ETHER_HDR_LEN) { if (m->m_len < sizeof(struct atmllc) + ETHER_HDR_LEN) {
m = m_pullup(m, sizeof(struct atmllc) + ETHER_HDR_LEN); m = m_pullup(m, sizeof(struct atmllc) + ETHER_HDR_LEN);
if (m == NULL) { if (m == NULL) {
NG_FREE_ITEM(item);
return (ENOMEM); return (ENOMEM);
} }
} }
@ -236,6 +237,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p item)
} }
if (outhook == NULL) { if (outhook == NULL) {
NG_FREE_M(m);
NG_FREE_ITEM(item); NG_FREE_ITEM(item);
return (0); return (0);
} }