Skip to content

Commit 07f8e4d

Browse files
Florian Westphaldavem330
authored andcommitted
tcp: also NULL skb->dev when copy was needed
In rare cases retransmit logic will make a full skb copy, which will not trigger the zeroing added in recent change b738a18 ("tcp: ensure skb->dev is NULL before leaving TCP stack"). Cc: Eric Dumazet <[email protected]> Fixes: 75c119a ("tcp: implement rb-tree based retransmit queue") Fixes: 28f8bfd ("netfilter: Support iif matches in POSTROUTING") Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 702151d commit 07f8e4d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/ipv4/tcp_output.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3041,8 +3041,12 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
30413041

30423042
tcp_skb_tsorted_save(skb) {
30433043
nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
3044-
err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
3045-
-ENOBUFS;
3044+
if (nskb) {
3045+
nskb->dev = NULL;
3046+
err = tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC);
3047+
} else {
3048+
err = -ENOBUFS;
3049+
}
30463050
} tcp_skb_tsorted_restore(skb);
30473051

30483052
if (!err) {

0 commit comments

Comments
 (0)