| Message ID | 1404764570-24120-1-git-send-email-andrey.krieger.utkin@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2014-07-07 at 23:22 +0300, Andrey Utkin wrote: > 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> > --- Thanks ! Signed-off-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Andrey Utkin <andrey.krieger.utkin@gmail.com> Date: Mon, 7 Jul 2014 23:22:50 +0300 > 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> Applied and queued up for -stable. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 01a1082..bfcf6be 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -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;
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> --- net/appletalk/ddp.c | 3 --- 1 file changed, 3 deletions(-)