projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48cec89
)
tcp: add a missing sk_defer_free_flush() in tcp_splice_read()
author
Eric Dumazet
<edumazet@google.com>
Thu, 20 Jan 2022 12:45:30 +0000
(
04:45
-0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Fri, 21 Jan 2022 04:17:50 +0000
(20:17 -0800)
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")
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Gal Pressman <gal@nvidia.com>
Link:
https://lore.kernel.org/r/20220120124530.925607-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/tcp.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index
3b75836
..
78e8146
100644
(file)
--- a/
net/ipv4/tcp.c
+++ b/
net/ipv4/tcp.c
@@
-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;