diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-05-15 18:10:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-15 18:22:41 +0200 |
| commit | 858f5017446764e8bca0b29589a3b164186ae471 (patch) | |
| tree | 373f0ffe2041cc465d0c0582b27da70f6179d7ee /include | |
| parent | enetc: Add missing link state info for ethtool (diff) | |
| download | linux-858f5017446764e8bca0b29589a3b164186ae471.tar.xz linux-858f5017446764e8bca0b29589a3b164186ae471.zip | |
tcp: do not recycle cloned skbs
It is illegal to change arbitrary fields in skb_shared_info if the
skb is cloned.
Before calling skb_zcopy_clear() we need to ensure this rule,
therefore we need to move the test from sk_stream_alloc_skb()
to sk_wmem_free_skb()
Fixes: 4f661542a402 ("tcp: fix zerocopy and notsent_lowat issues")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Diagnosed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 4d208c0f9c14..0680fa988497 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1473,7 +1473,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) sock_set_flag(sk, SOCK_QUEUE_SHRUNK); sk->sk_wmem_queued -= skb->truesize; sk_mem_uncharge(sk, skb->truesize); - if (!sk->sk_tx_skb_cache) { + if (!sk->sk_tx_skb_cache && !skb_cloned(skb)) { skb_zcopy_clear(skb, true); sk->sk_tx_skb_cache = skb; return; |