Commit 36beddc2 authored Jul 07, 2014 by Andrey Utkin Committed by David S. Miller Jul 08, 2014

appletalk: Fix socket referencing in skb

Setting just skb->sk without taking its reference and setting a
destructor is invalid. However, in the places where this was done, skb
is used in a way not requiring skb->sk setting. So dropping the setting
of skb->sk.
Thanks to Eric Dumazet <eric.dumazet@gmail.com> for correct solution.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79441


Reported-by: Ed Martin <edman007@edman007.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e0056593

net/appletalk/ddp.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1489,8 +1489,6 @@ static int atalk_rcv(struct sk_buff skb, struct net_device dev,
		goto drop;

		/* Queue packet (standard) */
		skb->sk = sock;

		if (sock_queue_rcv_skb(sock, skb) < 0)
		goto drop;

		@@ -1644,7 +1642,6 @@ static int atalk_sendmsg(struct kiocb iocb, struct socket sock, struct msghdr
		if (!skb)
		goto out;

		skb->sk = sk;
		skb_reserve(skb, ddp_dl->header_length);
		skb_reserve(skb, dev->hard_header_len);
		skb->dev = dev;