diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-26 11:34:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-26 23:25:39 -0400 |
commit | 50754d2188b04a679a249fb57751542643a436e0 (patch) | |
tree | ccffc5647ba1ea8f4d89cabe27a28f3ddfbf77fe /net/netlink | |
parent | 78d0b11dcedb21ee432d19eed1a3fa03e8f95353 (diff) |
genetlink: fix possible memory leak in genl_family_rcv_msg()
'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 def3117493eafd9dfa1f809d861e0031b2cc8a07
(genl: Allow concurrent genl callbacks.)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/genetlink.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 2f72598dd8fe..2fd6dbea327a 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c | |||
@@ -598,7 +598,7 @@ static int genl_family_rcv_msg(struct genl_family *family, | |||
598 | err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr, | 598 | err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr, |
599 | ops->policy); | 599 | ops->policy); |
600 | if (err < 0) | 600 | if (err < 0) |
601 | return err; | 601 | goto out; |
602 | } | 602 | } |
603 | 603 | ||
604 | info.snd_seq = nlh->nlmsg_seq; | 604 | info.snd_seq = nlh->nlmsg_seq; |
@@ -613,7 +613,7 @@ static int genl_family_rcv_msg(struct genl_family *family, | |||
613 | if (family->pre_doit) { | 613 | if (family->pre_doit) { |
614 | err = family->pre_doit(ops, skb, &info); | 614 | err = family->pre_doit(ops, skb, &info); |
615 | if (err) | 615 | if (err) |
616 | return err; | 616 | goto out; |
617 | } | 617 | } |
618 | 618 | ||
619 | err = ops->doit(skb, &info); | 619 | err = ops->doit(skb, &info); |
@@ -621,6 +621,7 @@ static int genl_family_rcv_msg(struct genl_family *family, | |||
621 | if (family->post_doit) | 621 | if (family->post_doit) |
622 | family->post_doit(ops, skb, &info); | 622 | family->post_doit(ops, skb, &info); |
623 | 623 | ||
624 | out: | ||
624 | if (family->parallel_ops) | 625 | if (family->parallel_ops) |
625 | kfree(attrbuf); | 626 | kfree(attrbuf); |
626 | 627 | ||