diff options
| author | Andrey Utkin <andrey.krieger.utkin@gmail.com> | 2014-07-07 23:22:50 +0300 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-11-25 15:20:25 +0100 |
| commit | 367941c377e3da97f2c4ef150bd0c2ee8e0ec8fe (patch) | |
| tree | 43ad7419ea46d5b007663e885593d1118c9f231e | |
| parent | 88c43bbc5787bb92034d82adc439415b06b4d233 (diff) | |
| download | linux-2.6.32.y-drm33.z-367941c377e3da97f2c4ef150bd0c2ee8e0ec8fe.tar.gz | |
appletalk: Fix socket referencing in skb
[ Upstream commit 36beddc272c111689f3042bf3d10a64d8a805f93 ]
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | net/appletalk/ddp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 5eae3606f32ff4..d44ac8dc11b852 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1469,8 +1469,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; @@ -1616,7 +1614,6 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr if (!skb) return err; - skb->sk = sk; skb_reserve(skb, ddp_dl->header_length); skb_reserve(skb, dev->hard_header_len); skb->dev = dev; |