diff options
author | Florian Westphal <fw@strlen.de> | 2015-12-31 16:26:33 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-15 23:42:42 +0300 |
commit | 9776b3e2f1e6fc0afcdcfe70ee14fb1b8dd03dff (patch) | |
tree | 3d3bd43d19d28410eb1f7537075bada1b462e579 /drivers/connector | |
parent | b079e7be7daad50d4b8b30776d368b709a4b7aae (diff) | |
download | linux-9776b3e2f1e6fc0afcdcfe70ee14fb1b8dd03dff.tar.xz |
connector: bump skb->users before callback invocation
[ Upstream commit 55285bf09427c5abf43ee1d54e892f352092b1f1 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/connector')
-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 f612d68629dc..fd7430e30cbc 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -172,26 +172,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); } |