diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-12-30 19:12:32 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-01-03 03:44:03 +0100 |
| commit | 56b824eb49d6258aa0bad09a406ceac3f643cdae (patch) | |
| tree | ad1351593318661a8084f9db05881fed0473e3ec /net/mptcp/protocol.c | |
| parent | mptcp: don't always assume copied data in mptcp_cleanup_rbuf() (diff) | |
| download | linux-56b824eb49d6258aa0bad09a406ceac3f643cdae.tar.xz linux-56b824eb49d6258aa0bad09a406ceac3f643cdae.zip | |
mptcp: prevent excessive coalescing on receive
Currently the skb size after coalescing is only limited by the skb
layout (the skb must not carry frag_list). A single coalesced skb
covering several MSS can potentially fill completely the receive
buffer. In such a case, the snd win will zero until the receive buffer
will be empty again, affecting tput badly.
Fixes: 8268ed4c9d19 ("mptcp: introduce and use mptcp_try_coalesce()")
Cc: stable@vger.kernel.org # please delay 2 weeks after 6.13-final release
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-3-8608af434ceb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/protocol.c')
| -rw-r--r-- | net/mptcp/protocol.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5307fff9d995..1b2e7cbb577f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -136,6 +136,7 @@ static bool mptcp_try_coalesce(struct sock *sk, struct sk_buff *to, int delta; if (MPTCP_SKB_CB(from)->offset || + ((to->len + from->len) > (sk->sk_rcvbuf >> 3)) || !skb_try_coalesce(to, from, &fragstolen, &delta)) return false; |