Commit 07f8e4d0 authored Mar 20, 2020 by Florian Westphal Committed by David S. Miller Mar 20, 2020

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
b738a185 ("tcp: ensure skb->dev is NULL before leaving TCP stack").

Cc: Eric Dumazet <edumazet@google.com>
Fixes: 75c119af ("tcp: implement rb-tree based retransmit queue")
Fixes: 28f8bfd1 ("netfilter: Support iif matches in POSTROUTING")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 702151da

net/ipv4/tcp_output.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -3041,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) {

Admin message