From nobody Wed Jan 21 12:48:47 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 4dx3sX2qBGz6P8xL for ; Wed, 21 Jan 2026 12:48:48 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3sX1k80z3HgT for ; Wed, 21 Jan 2026 12:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999728; 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=SXuI0mKghKV9cGsKtWhw495RIWvp3jm0/HpAbZLw86c=; b=QhOdJu60UXIVggF8sagAD8JAbq8cB+Ciu3gT+6dabP8r4mSJBawjdJ0mITsli/TJubcQ/q 9XfTg54lXAKhF7sdoM7JkrLCv5QXns+bC6X7ldSOgygh2fqHmSMkboGh1myQNtQK1wMcbf TYl4+01PvMsgaEjv9Oyl86nv82EWmyLFlqw3l4F1/upFPCHA1+t+iCGSZ7Io0uWvSCxLUA WEOEG15RJ7D6qmgQEDBPIrxUNHck1L1pyxKqg3EyCEjlxyW1ekX9vgTzhN8HWt8tJdC03H pHOjZXmzfOEA4GwpZ2x85ayOUURimSVtp3GRA/b0VipnignU3KZzSwB1BS+b5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999728; 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=SXuI0mKghKV9cGsKtWhw495RIWvp3jm0/HpAbZLw86c=; b=lJv3ljgRSc6WP8RD3gK/QGWOOjPSpaGKSOwG2FmIu8ytrMlejPIs15laoNfcm67/C7IrUV 7l5/IAj9A7OVnChpPM23UsQdUld/aoNf2tMo3qdBRh/Fn1zOVZc+BmJLoJLTlaBFQ0naIE zdlC6vUHPlPrfcHNkNGjYaBznRh5nQBvefP/0s0SORQQm3+xkSaPxQA5/JwQHTMwuzyMdr m/4X8cJ8+bfKpt5ARcDNp5qHzd74/t1SjriYxDOtfUUEW4lIh0swvOQCHnvR6vanbyPEwi UcmryNgWO/Mgxlb6iFDrD6awkvQZEET/DUfvSgODxweJTRuuUq2OmSpqEcpV7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999728; a=rsa-sha256; cv=none; b=K3StNYDJBwxOKsmDDxCJ7XQ4t71JU7+F7X5SknnR39sAf8NMPt2y0wDwh9PmunCFJhZEw9 /kLxc2y2OyLfiM1YmaHO9+hfnyB1YRPuvCw6xEqnje4jqjKB0b2h4wyQV/lHa6lbIzzzl2 pxhI+qQJxPQoZaGFvgo2Q0S4W4RT1rCxyHVru8fPCZW3OA1tvf/KLFb0ZtTho4Rw3zV/uE GPqw0AtRwRDu7FatkXsZgaYZSuFgTjsBDPOs+YFByG3vfi+3Rsjjux5eppYZEXSxzk7voH aTvlBZo8s16ipsbbUk6WKDgiJAQz9q+Y/R1soBAJ1wMnHPru/BL7x3roZ/qH7Q== 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 4dx3sX00g6znkh for ; Wed, 21 Jan 2026 12:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:48:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: fab0a83ff748 - stable/14 - tcp: fix checksum calculation bug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fab0a83ff7484a069f04ec9c6b5657ec9676c7dd Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:48:47 +0000 Message-Id: <6970cb2f.3ffc6.51b1a398@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fab0a83ff7484a069f04ec9c6b5657ec9676c7dd commit fab0a83ff7484a069f04ec9c6b5657ec9676c7dd Author: Timo Völker AuthorDate: 2025-12-19 16:50:20 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:46:28 +0000 tcp: fix checksum calculation bug The new function in_delayed_cksum_o() was introduced to compute the checksum in the case the mbuf chain does not start with the IP header. The offset of the IP header is specified by the parameter iph_offset. If iph_offset was positive, the function computed an incorrect checksum. Reviewed by: sobomax, tuexen Fixes: 5feb38e37847 ("netinet: provide "at offset" variant of the in_delayed_cksum() API") Differential Revision: https://reviews.freebsd.org/D54269 (cherry picked from commit c8b3b605ae854ead6c8804e0400d80cb8fa73fdf) --- sys/netinet/ip_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index e3ef8e2c7dd9..e97e10db0e6b 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1068,8 +1068,8 @@ in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset) if (csum == 0) csum = 0xffff; } else { - cklen = ntohs(ip->ip_len); - csum = in_cksum_skip(m, cklen, offset); + cklen = ntohs(ip->ip_len) - (ip->ip_hl << 2); + csum = in_cksum_skip(m, cklen + offset, offset); } offset += m->m_pkthdr.csum_data; /* checksum offset */