Skip to contentSkip to conversation

tcp: add a missing sk_defer_free_flush() in tcp_splice_read()

PATCH Applied Eric Dumazet 2 participants 2 messages Jan 20, 2022 – Jan 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tcp: add a missing sk_defer_free_flush() in tcp_splice_read()

From: Eric Dumazet <[email protected]>

Without it, splice users can hit the warning
added in commit 79074a72d335 ("net: Flush deferred skb free on socket destroy")

Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
Fixes 79074a72d335 ("net: Flush deferred skb free on socket destroy")
Cc Gal Pressman <[email protected]>
---
 net/ipv4/tcp.c | 1 +
 1 file changed, 1 insertion(+)
net/ipv4/tcp.c +1 -0
index 3b75836db19b07b0f178ef4457bda0ec641fd40d..78e81465f5f3632f54093495d2f2a064e60c7237 100644
@@ -842,6 +842,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
 	}
 
 	release_sock(sk);
+	sk_defer_free_flush(sk);
 
 	if (spliced)
 		return spliced;
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
#1 lore raw
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 5 lines · On Thu, 20 Jan 2022 04:45:30 -0800 you wrote:

From: Eric Dumazet <[email protected]>

Without it, splice users can hit the warning
added in commit 79074a72d335 ("net: Flush deferred skb free on socket destroy")

Quoted 7 lines
Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
Fixes 79074a72d335 ("net: Flush deferred skb free on socket destroy")
Cc Gal Pressman <[email protected]>

[...]

Here is the summary with links:
- [net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read()

    https://git.kernel.org/netdev/net/c/ebdc1a030962

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html