diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2020-01-09 07:59:23 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-09 18:41:41 -0800 |
| commit | e66b2f31a068dd67172008459678821a79e4ea24 (patch) | |
| tree | 209fe9c35de5af33000783941c87a3ccfa93d998 /include/net | |
| parent | tcp: Check for filled TCP option space before SACK (diff) | |
| download | linux-dev-e66b2f31a068dd67172008459678821a79e4ea24.tar.xz linux-dev-e66b2f31a068dd67172008459678821a79e4ea24.zip | |
tcp: clean ext on tx recycle
Otherwise we will find stray/unexpected/old extensions value on next
iteration.
On tcp_write_xmit() we can end-up splitting an already queued skb in two
parts, via tso_fragment(). The newly created skb can be allocated via
the tx cache and an upper layer will not be aware of it, so that upper
layer cannot set the ext properly.
Resetting the ext on recycle ensures that stale data is not propagated
in to packet headers or elsewhere.
An alternative would be add an additional hook in tso_fragment() or in
sk_stream_alloc_skb() to init the ext for upper layers that need it.
Co-developed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 8766f9bc3e70..432ff73d20f3 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1464,6 +1464,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) sk_mem_uncharge(sk, skb->truesize); if (static_branch_unlikely(&tcp_tx_skb_cache_key) && !sk->sk_tx_skb_cache && !skb_cloned(skb)) { + skb_ext_reset(skb); skb_zcopy_clear(skb, true); sk->sk_tx_skb_cache = skb; return; |