tcp: also NULL skb->dev when copy was needed
Subsystems (3)
PATCH 1/1 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 changeb738a185beaa ("tcp: ensure skb->dev is NULL before leaving TCP stack").
--- net/ipv4/tcp_output.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +6 -2
@@ -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) {
Signature · 1 line
2.24.1
Quoted 9 lines · Florian Westphal
In rare cases retransmit logic will make a full skb copy, which will not trigger the zeroing added in recent change
b738a185beaa("tcp: ensureskb->devis NULL before leaving TCP stack").Cc Eric Dumazet <[email protected]>Fixes 75c119afe14f ("tcp: implement rb-tree based retransmit queue")Fixes 28f8bfd1ac94 ("netfilter: Support iif matches in POSTROUTING")Signed-off-by Florian Westphal <[email protected]>---
Good catch, thanks Florian !
David Miller
maintainerFrom: Florian Westphal <[email protected]>
Date: Fri, 20 Mar 2020 16:52:02 +0100
Quoted 8 lines
In rare cases retransmit logic will make a full skb copy, which will not trigger the zeroing added in recent change
b738a185beaa("tcp: ensureskb->devis NULL before leaving TCP stack").Cc Eric Dumazet <[email protected]>Fixes 75c119afe14f ("tcp: implement rb-tree based retransmit queue")Fixes 28f8bfd1ac94 ("netfilter: Support iif matches in POSTROUTING")Signed-off-by Florian Westphal <[email protected]>
Applied and queued up for -stable.