lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genetlink: fix possible memory leak in genl_family_rcv_msg()

Browse Source 
'attrbuf' is malloced in genl_family_rcv_msg() when family->maxattr &&
family->parallel_ops, thus should be freed before leaving from the error
handling cases, otherwise it will cause memory leak.

Introduced by commit def3117493
(genl: Allow concurrent genl callbacks.)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wei Yongjun
2013-04-26 15:34:16 +00:00
committed by David S. Miller
parent 78d0b11dce
commit 50754d2188
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/netlink/genetlink.c
View File

@@ -598,7 +598,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr, err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr,
ops->policy); ops->policy);
if (err < 0) if (err < 0)
return err; goto out;
} }
info.snd_seq = nlh->nlmsg_seq; info.snd_seq = nlh->nlmsg_seq;
@@ -613,7 +613,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
if (family->pre_doit) { if (family->pre_doit) {
err = family->pre_doit(ops, skb, &info); err = family->pre_doit(ops, skb, &info);
if (err) if (err)
return err; goto out;
} }
err = ops->doit(skb, &info); err = ops->doit(skb, &info);
@@ -621,6 +621,7 @@ static int genl_family_rcv_msg(struct genl_family *family,
if (family->post_doit) if (family->post_doit)
family->post_doit(ops, skb, &info); family->post_doit(ops, skb, &info);
out:
if (family->parallel_ops) if (family->parallel_ops)
kfree(attrbuf); kfree(attrbuf);