diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-06-28 01:35:08 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-06-28 01:35:09 +0300 |
| commit | 2f5a4117599caa29ea594585a82cef21d7812302 (patch) | |
| tree | 966d82b8403bcfab4ed758ef454cb60fac48f63e /net/ipv4/tcp_input.c | |
| parent | 680367bc9be929235cb9d972c8614c1fe16fa67a (diff) | |
| parent | 8cc8d749dc7eac9ee8355aa91042aac6c7afa639 (diff) | |
| download | linux-2f5a4117599caa29ea594585a82cef21d7812302.tar.xz | |
Merge branch 'tcp-fix-dsack-bug-with-non-contiguous-ranges'
Eric Dumazet says:
====================
tcp: fix DSACK bug with non contiguous ranges
This series combines a fix from xin.guo and a new packetdrill test.
====================
Link: https://patch.msgid.link/20250626123420.1933835-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 19a1542883df..79e3bfb0108f 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4845,8 +4845,9 @@ static void tcp_ofo_queue(struct sock *sk) if (before(TCP_SKB_CB(skb)->seq, dsack_high)) { __u32 dsack = dsack_high; + if (before(TCP_SKB_CB(skb)->end_seq, dsack_high)) - dsack_high = TCP_SKB_CB(skb)->end_seq; + dsack = TCP_SKB_CB(skb)->end_seq; tcp_dsack_extend(sk, TCP_SKB_CB(skb)->seq, dsack); } p = rb_next(p); |