From nobody Tue Nov 17 19:52:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTb3P3DXzz71lDM for ; Tue, 17 Nov 2026 19:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTb3N6vgDz3GgS for ; Tue, 17 Nov 2026 19:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T6j0a/betdJGWzAqiiAdShLrIrxOivJtoOvjhdtopA=; b=aJ7byBhnrlbG15vIrxsnWEoa9e18ML4vctbPSj7/2HxvhmwoUv5/wjseSHEhAcSKJwojHp M/7iCgxj16/EO6xxcU2BzafFLwQy0IaxYkJUYqeiFPq00IknpML+lceRYV2Ipj0odwBikU eiOYTN/u9EqoCSA4s5qMjkNnye4HYasj6JyRff6OiAIS9IMesHOBK+gRpsLajVbKoblJQb /7729KzF5DScijg9UrsmyEgsg/16KhP8Z1kJ0Vvb1F8WimEbzUenNUVAp+igS3kBxfY4y5 ltL5Xee2lNwodNQWPMSzmeCilJIbJu39WmcXWpKsc0pWzMWEotzlrs4Uq9GhTQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794945121; b=aJDEavqqJ7/s+9EZOpSXGqA48xMe9fFZZM2NKUjf1EEB7Ajr4JEOQ4VN9ncrrLzKbY2P7E tFY1OpsVDszOgn/paj8HAqat/0CA9Hy5kGV0SOfFdNzRYdmGRw3b4frEq2UMhFOqHdP+c7 VqzEncE0MKqMke75LDA7yd+tzLGTq1bYDmjUQAgitOKPmeiAyk/g30gSDLxphDPWdlf9R9 lI9aE+dZo8mhqfDa/3UKn/zvoVvsfLpH8Q4CSRWXtB1XaGiG3EtxGZKhx6itMbMefzNkvz smUDoAacytlSx8WHDneMsGr/Y1FqSTJkWLWu0Pk3yHjxocfJOEpd8P87FAzz+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794945121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T6j0a/betdJGWzAqiiAdShLrIrxOivJtoOvjhdtopA=; b=GU6YakxGmY0+tp9sGpiuKGdOTbxszQ3zuoJP116auU8ciNzfKFboJkLeUfqi2gAr5w/T3Z 8lpOZpBFr6EvSf+bwmEkSzVzvq3qBYpqMvX04z0buCgNAhEUfWW/aIzHibQPi2UnENmGXP LMv0VA2tqyI4T/G9nBLTMNauQ0ldo9e4ICOReGIsAC1yGHM+9U16PmkpOi0kQt1tF7PPUO 9JOoLOSts0+1ljMxyd2lLradpU7ETuXGU1md6TFY0HIVUreqhPcqj2oQuf+uS3dAHN6t6v Z4oHIZW7F7NKLw9f3FoqqDDPqtN85RPqhn7aRj7IG9V7vEeo5oYQWZlxZVmF1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTb3N65BJzxV6 for ; Tue, 17 Nov 2026 19:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fbe9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 19:52:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Richard Scheffenegger From: Colin Percival Subject: git: cd2a0f873c13 - releng/15.2 - tcp: address PR295870 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: cd2a0f873c132ed734a36875aad190d447a59bc5 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 19:52:00 +0000 Message-Id: <6afcb060.fbe9.71f26db4@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2a0f873c132ed734a36875aad190d447a59bc5 commit cd2a0f873c132ed734a36875aad190d447a59bc5 Author: Richard Scheffenegger AuthorDate: 2026-11-08 15:36:13 +0000 Commit: Colin Percival CommitDate: 2026-11-17 19:51:39 +0000 tcp: address PR295870 Fix accounting in the sequence space for a FIN bit potentially piggy bagged during SACK loss recovery triggered transmissions. Approved by: re (cperciva) Reviewed By: #transport, tuexen Sponsored by: NetApp, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61312 (cherry picked from commit 0aa6428f463699c5f5e03715ea4ebe2309a23a2d) (cherry picked from commit f5797fcb0d8d8b2a63a49c3fe27eb9d7c7c417a8) --- sys/netinet/tcp_output.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 208f72c4661c..55a8090cf7e2 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1192,6 +1192,7 @@ send: if (flags & TH_FIN && tp->t_flags & TF_SENTFIN && tp->snd_nxt == tp->snd_max) tp->snd_nxt--; + KASSERT(SEQ_LEQ(tp->snd_nxt, tp->snd_max), ("SEG_GT(snd_nxt, snd_max)")); /* * If we are starting a connection, send ECN setup * SYN packet. If we are on a retransmit, we may @@ -1543,8 +1544,16 @@ out: tp->t_flags |= TF_SENTFIN; } } - if (sack_rxmit) + if (sack_rxmit) { + /* + * Retransmitted bytes are already in snd_max. + * A FIN on this segment is not. snd_nxt was + * advanced for it above. + */ + if (SEQ_GT(tp->snd_nxt, tp->snd_max)) + tp->snd_max = tp->snd_nxt; goto timer; + } tp->snd_nxt += len; if (SEQ_GT(tp->snd_nxt, tp->snd_max)) { /*