From nobody Mon Nov 16 12:43:15 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 4jSnb73dLQz70YDR for ; Mon, 16 Nov 2026 12:43:15 +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 4jSnb72yyyz3Gx5 for ; Mon, 16 Nov 2026 12:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794832995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjfrlzVWF7P/HMg49cxlJkEMsfWtCKkXegXL2KNU6ZQ=; b=c2DZCQNfKi4vc5R/nw7I4IcW15Aq+XOa1wadJ+BpglBMXzBJdnRwpZIYT+diOcJAvX4OLL b3vHV7SOA55ZX4L+6g8Wlavp1NfMHLcgS/gMWPVYarGEQke+a+zqKC2YjlKNaapsz1q86v Eb2hmoX6zI7VcJnucSCJ6vSpF//nar1T4E+W6setn5EcD92ZnDjVNxUfoITosOGB+gYT4k 5mNNn+olgiRhzQ/8ylHjllrefARMpJt5rWAmIN2ko3PwNOKyHAYMn4GOUs2FSU2zWAWVGP QjO6evnjTNBCxMcN0dyMvrjYy+jjDkRtwZPEOOdmOUyZCdU41mF3gFzEvIH6cw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794832995; b=sxtn51bOwuvNEwDlD8g1rka4eLTL/mHW6ZxVIsdj5x7BxQ33C3w6/j/3lw8w2s5KAeQe7K ewhCDkz070HTaADWw/mbKQ1k4reSMDh4WkpXd0HBUrxJVrW32nYj8rPV4s3TcceRMUJMK2 o1KVs66Tknq5BIYi41lUbK6Wkm+LwvDF5M0qkLndXZ9gJYK7ys1rUnu2av9kiwjhQlWU3Y U6U9MSSNk9JPjF+K5Pu1jhz8M2kCD0RTLW2xFerdvjVHGKbomEv1Ywk/NjgwgNY1BDG/b2 4YrrOEHf/sUtMX4zeO2A6tRUCcZ/RvwsijJk1IkevmObO9tIYrNdVoeY7T0kCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794832995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjfrlzVWF7P/HMg49cxlJkEMsfWtCKkXegXL2KNU6ZQ=; b=a7wGu7/PEHeo6NrGH2qNOZXCw+hM3896Doj9/LB6L/jWJnR5QpqETvGEUK/SpkA8mTKhKq bhmMGvADyyrM2JWSOxH0RCJVE4QK3vM2/pwfEfSlB2QkRry4L2UPIle67dwckTfReRvHeS T1j/SLYL4Ljwjfy/xa16gZ97lhS47UJ2kq8FvCdKWdPeHsQmuudUCVzHyqWUQ6EczpA8i4 UjUCnev+R+Ewszx5zNRmC70m5/F0ZwzOepgcn5WZEyTBmpe//DdBHS4XoizP5gb/+tGsh2 rkzdfIHozNomlxVISXU3D+6Kz4tYx6qNHgp3/0MnYRWlszykaH7C+NJVRbhSVw== 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 4jSnb72crgzvW2 for ; Mon, 16 Nov 2026 12:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 12:43:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: f5797fcb0d8d - stable/15 - 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f5797fcb0d8d8b2a63a49c3fe27eb9d7c7c417a8 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 12:43:15 +0000 Message-Id: <6afafa63.195e5.5bdbe0fd@gitrepo.freebsd.org> The branch stable/15 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f5797fcb0d8d8b2a63a49c3fe27eb9d7c7c417a8 commit f5797fcb0d8d8b2a63a49c3fe27eb9d7c7c417a8 Author: Richard Scheffenegger AuthorDate: 2026-11-08 15:36:13 +0000 Commit: Richard Scheffenegger CommitDate: 2026-11-16 12:40:13 +0000 tcp: address PR295870 Fix accounting in the sequence space for a FIN bit potentially piggy bagged during SACK loss recovery triggered transmissions. Reviewed By: #transport, tuexen Sponsored by: NetApp, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61312 (cherry picked from commit 0aa6428f463699c5f5e03715ea4ebe2309a23a2d) --- 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)) { /*