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 changeb738a185be
("tcp: ensure skb->dev is NULL before leaving TCP stack"). Cc: Eric Dumazet <edumazet@google.com> Fixes:75c119afe1
("tcp: implement rb-tree based retransmit queue") Fixes:28f8bfd1ac
("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>
This commit is contained in:
Родитель
702151da6d
Коммит
07f8e4d0fd
|
@ -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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче