diff options
| author | Florian Westphal <fw@strlen.de> | 2015-12-31 16:26:33 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-05 05:46:45 +0300 |
| commit | 55285bf09427c5abf43ee1d54e892f352092b1f1 (patch) | |
| tree | 726080a4fd362374bad2386c02585d93ac78397b | |
| parent | 3934aa4c1f7f4ccdff25f530b0e37d776ac453e2 (diff) | |
| download | linux-55285bf09427c5abf43ee1d54e892f352092b1f1.tar.xz | |
connector: bump skb->users before callback invocation
Dmitry reports memleak with syskaller program.
Problem is that connector bumps skb usecount but might not invoke callback.
So move skb_get to where we invoke the callback.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/connector/connector.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index d7373ca69c99..25693b045371 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -179,26 +179,21 @@ static int cn_call_callback(struct sk_buff *skb) * * It checks skb, netlink header and msg sizes, and calls callback helper. */ -static void cn_rx_skb(struct sk_buff *__skb) +static void cn_rx_skb(struct sk_buff *skb) { struct nlmsghdr *nlh; - struct sk_buff *skb; int len, err; - skb = skb_get(__skb); - if (skb->len >= NLMSG_HDRLEN) { nlh = nlmsg_hdr(skb); len = nlmsg_len(nlh); if (len < (int)sizeof(struct cn_msg) || skb->len < nlh->nlmsg_len || - len > CONNECTOR_MAX_MSG_SIZE) { - kfree_skb(skb); + len > CONNECTOR_MAX_MSG_SIZE) return; - } - err = cn_call_callback(skb); + err = cn_call_callback(skb_get(skb)); if (err < 0) kfree_skb(skb); } |