From nobody Mon Nov 16 12:47:20 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 4jSngs2950z70YCH for ; Mon, 16 Nov 2026 12:47:21 +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 4jSngr6TBxz3HB7 for ; Mon, 16 Nov 2026 12:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794833240; 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=IPC+tMWLtEDzdsjyRnjRNglhTdld4eSHp6SjDKRWZQ8=; b=xgfZVQ3FXKUdcdNgpNLzIPBm72izUd8dmokoJAq4WD0rzZ8T+YJxI2j2Lpp23nOffzK5BQ Zerxc0v1tMi1MrmSAQEcnBvp1jyJDk/Hv5sH9UFI4cjWqR12BRGH49TEUUy/KqWnLrQIp/ C6NFIBvmhIqPxPNYKLlTMeKiRkZLxgXOXd6rTRuSoEc7+G1DHM5/uwX23IdtIQpWnMVeCP N4UUqBYMA3QZXw9RsHREXQPOq24jUCCbp8hYezNSNGM84e0f31vvYhyOev0iomFoNpqXhl zfi46KB+QF/O5JJSQTXeU4b137t85hbuj0wzrcl2oMFyQ1EHX0Kq7CIbq+hGGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794833240; b=MCzHc4vSYnFhkvIpvfNRQZWX1EBOYnwyf/lFoNzg+8KCAvWW0ORn1RD4sVhSYdHTOGgGYn VnB3cjja0eqTYdRKTuwNIImmNycq5NVZhTRNZZal/fybSjI2uvj3TPrwxoqDHkKST3y4YG bo69Ce+jmqS0v/X320S8iMhFoUgZ/RN74q2ieEQbA+qmSZZYJqVOiumMzHmpBqVpI9IyBm dxopRxF1xLugMGoqw4ocg7VGsbvTXd/ealR6wilejcsaltTexkhKKN9juoTC/tIugvNmls 5oM9ec8DJsHzIVRxX2TSwoJQ8jYGj4Mc0vLIcygRD3EbjFcSe7YzAMgmRTGFXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794833240; 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=IPC+tMWLtEDzdsjyRnjRNglhTdld4eSHp6SjDKRWZQ8=; b=Snd6AxJYtkOaJJUxgcduXYmhhI50ZZG47ef3c4zzkh7qDz/n/pxl8NJepTtpq2mNuD5Mfg rx1M8x3nRGGGNz6FgIVbFV2xTxOXsVE509ISbVE0Dn218HwgXGyklCBRuZgOfoKH8J/+5N 7lENfmHqCIAgZuEbCsnvBAdjcbuDtq6yML3zW0x7/QiEDkEhTpAkg4XKGuGnZZdtSxWFKk yrASAG+hO7Snv2OtW1AddH96ssCHNGBXmnECMxzgdYEIX0h/2ooeUnqG+JXvk/l7fPRuwX 8x8eiM8Oi9eN5HR9FlHuZ+xobW0irId6Cjmf8dcHMSqR0wzq+QUif/4/Zr0lSg== 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 4jSngr5f9TzvZ0 for ; Mon, 16 Nov 2026 12:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ac4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 12:47:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: a7cdf5cd9cc6 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a7cdf5cd9cc6562e828a1723fa4a67c893141d23 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 12:47:20 +0000 Message-Id: <6afafb58.1ac4f.61f259b2@gitrepo.freebsd.org> The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=a7cdf5cd9cc6562e828a1723fa4a67c893141d23 commit a7cdf5cd9cc6562e828a1723fa4a67c893141d23 Author: Richard Scheffenegger AuthorDate: 2026-11-08 15:36:13 +0000 Commit: Richard Scheffenegger CommitDate: 2026-11-16 12:43:52 +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 a8e2a18f72da..6da1dbd1ea24 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1197,6 +1197,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 @@ -1552,8 +1553,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)) { /*