diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-07-10 05:24:12 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-07-10 05:24:12 +0300 |
| commit | 95253dc7002408aec7cbb7281478f03797ca2519 (patch) | |
| tree | 715c09c72ebf9ab09b3a87eeb39e99b909fa89f0 /net | |
| parent | ffdde7bf5a439aaa1955ebd581f5c64ab1533963 (diff) | |
| parent | b939c074efc160648de884a41aeb5e857f2c5c68 (diff) | |
| download | linux-95253dc7002408aec7cbb7281478f03797ca2519.tar.xz | |
Merge branch 'tcp-better-memory-control-for-not-yet-accepted-sockets'
Eric Dumazet says:
====================
tcp: better memory control for not-yet-accepted sockets
Address a possible OOM condition caused by a recent change.
Add a new packetdrill test checking the expected behavior.
====================
Link: https://patch.msgid.link/20250707213900.1543248-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 12c2e6fc85c6..68bc79eb9019 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5181,7 +5181,9 @@ end: skb_condense(skb); skb_set_owner_r(skb, sk); } - tcp_rcvbuf_grow(sk); + /* do not grow rcvbuf for not-yet-accepted or orphaned sockets. */ + if (sk->sk_socket) + tcp_rcvbuf_grow(sk); } static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, |