Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9776b3e2 authored by Florian Westphal's avatar Florian Westphal Committed by Sasha Levin
Browse files

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: default avatarDmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent b079e7be

drivers/connector/connector.c

+3 −8
Original line number Diff line number Diff line
@@ -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);

	}