Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / net / ipv4 / tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 306e25d743e8de1bfe23d6e3b3a9fb0f23664912..2f45cde168c4abca8248fb835f79149260c7f418 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1109,6 +1109,10 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,
 
                if (unlikely(!skb))
                        return -ENOBUFS;
+               /* retransmit skbs might have a non zero value in skb->dev
+                * because skb->dev is aliased with skb->rbnode.rb_left
+                */
+               skb->dev = NULL;
        }
 
        inet = inet_sk(sk);
@@ -3037,8 +3041,12 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
 
                tcp_skb_tsorted_save(skb) {
                        nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
-                       err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
-                                    -ENOBUFS;
+                       if (nskb) {
+                               nskb->dev = NULL;
+                               err = tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC);
+                       } else {
+                               err = -ENOBUFS;
+                       }
                } tcp_skb_tsorted_restore(skb);
 
                if (!err) {