From nobody Fri Nov 13 20:28:19 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 4jR83805zrz6y28j for ; Fri, 13 Nov 2026 20:28:20 +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 4jR837661Wz4nH9 for ; Fri, 13 Nov 2026 20:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794601699; 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=ISzDrB7DOwkBROB6UMI5HuO3HFBecqNzlpn+cCSJeac=; b=GrsPS8B91uRn8UY+GMLBgVF85OYSxjRAC1l1Ak1471/YGA1ZgPkvL3exaNm4FUuGNjkMo7 CtMKd/m42EqIL04rD4yxunHhC1TEfkLk9DKJb73RzTQG1kwQCmsGOwA5dQ+Qx8UZVDQYWm A3oNTaS1am3o9ftM16G+gWLZ5gfbkDYn/nebnPPdd60bx7uV039z4kv/n6IGBPMwCJdl2e Y6yaSD/jSujZcpy/Li5lF0+lPrqHO4dHAnlDZgJ1TvQ7JHpPFwCDm/p/ONo27bdjC7EegC q8rvrjTrcqTxdXoENTdEscY3S5DxZME+I3FIzkFCe9T3+0Nyd1+WUsVrk60mEQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794601699; b=MIonO9JEPx2imPXYRLbOQdbzr4pM81/W20uk6/o/Iy1qGytBBrifMwDarvnK+89TUzTmz0 0aCbynzNVqD2UPHHx5G2SluX31D/c+Yzvwrw8bL7LuzGq7bcKaBtkCESbmEldVLkbslYUL h5UvxRipZTa+yboieCzQ4QHoFKKTNj2U+6/UMK99CwiYyy1RbTnLwJPzKxzkzqAagIWMgm vNGVWPxKLSO7tBvtfYP/u1EZk1MNNZiG/o5vBAkI4y6cHrcYB4pEeoIYBBp1urBwrBGiff j4Ob6KiP/f3CTwckKBb91MRLxqfpxXu3UWxdfVxeWgX/6hU63JQE78eXO/lnHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794601699; 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=ISzDrB7DOwkBROB6UMI5HuO3HFBecqNzlpn+cCSJeac=; b=b8XdLh0ICuyUZ8B9dycQmvjsz9oRxp0/ZwsLfEjRfUfvkpJFsyxUXrx7fL6wKZKCt9E6jc N8PLat1tGHpTIxcUn+PyuDixCLA/Emn4U1QVrfF+c5UDGiCNHayVzoopg4fitCmp9HPx7d 3fyEiEGSpuBAj0UEMHN8I4sdIQUi+BUwLGf08zGBSHhGDBp9mDW460bQF0x65Op3gfU+PN Ka1MhEV1b/NgazZnUQoe49TRLIGrXvqd18xqt477fZ5WwJM/sHcP7zsGXgzFOkHcea6bns 1vw0jdR9ltOfz+qSSU12p4Bo/jdY4o+oNqT9/IFOzxeF+uYoPg9VJMEhxEhwUw== 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 4jR8375m1jzrSs for ; Fri, 13 Nov 2026 20:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3696 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 20:28:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: d3b02115d4b3 - main - tcp: count only the SACK blocks that fit in tcp_maxseg() 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: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3b02115d4b373c719d9a716da38d94511de3f07 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 20:28:19 +0000 Message-Id: <6af772e3.3696.2e9aa03d@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=d3b02115d4b373c719d9a716da38d94511de3f07 commit d3b02115d4b373c719d9a716da38d94511de3f07 Author: Nick Price AuthorDate: 2026-11-13 20:27:46 +0000 Commit: Nick Price CommitDate: 2026-11-13 20:27:49 +0000 tcp: count only the SACK blocks that fit in tcp_maxseg() tcp_addoptions() sends only the SACK blocks that fit in TCP_MAXOLEN. tcp_maxseg() counted every pending block and clamped the total, so without timestamps and with five or more blocks pending it came out 4 bytes below the segment tcp_output() sends. Limited transmit after an RTO then sent one full segment and failed the "sent too much" KASSERT. PR: 282605 Approved by: adrian (mentor) Signed-off-by: Nick Price Reviewed by: tuexen, glebius, adrian Differential Revision: https://reviews.freebsd.org/D60460 --- sys/netinet/tcp_subr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b62bc81ee4fe..aa933572b5f0 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -3797,9 +3797,12 @@ tcp_maxseg(const struct tcpcb *tp) optlen += PADTCPOLEN(TCPOLEN_SIGNATURE); #endif if ((tp->t_flags & TF_SACK_PERMIT) && tp->rcv_numsacks > 0) { - optlen += TCPOLEN_SACKHDR; - optlen += tp->rcv_numsacks * TCPOLEN_SACK; - optlen = PADTCPOLEN(optlen); + u_int sackblks; + + sackblks = min(tp->rcv_numsacks, (TCP_MAXOLEN - optlen - + PADTCPOLEN(TCPOLEN_SACKHDR)) / TCPOLEN_SACK); + optlen += PADTCPOLEN(TCPOLEN_SACKHDR + + sackblks * TCPOLEN_SACK); } } else { if (tp->t_flags & TF_REQ_TSTMP)