From nobody Mon Aug 24 05:37: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 4hT06Y6Nxjz6X2S3 for ; Mon, 24 Aug 2026 05:37:25 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hT06Y4BMvz4GsR for ; Mon, 24 Aug 2026 05:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787549845; 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=2G1/I7yoBzFJ7Qg7MnyRYsLJimug7ETrgzMENgQrNhM=; b=EcNmQNVi+ijUZPdvrF9ektJcZPkZojVpGcDi6ElRZHmP1fxaNi2OLlrJyUiELq/B7gksdJ y6DHrHW6HMh03uMZOK1Vakgqxtk2k/Nq4GISuw7vU+DUUWICmaP1aOGQ3FJ3SnZPGkL+BL wBH8PUtzTKflVCyazoM4VaFhUihE43JdT1sbppyr+1YSDs+xvIkiNiBYPA8x7W5S7G3Zvf rSrmvlpOrScL6onZNIqW0+KXoIRbpHwpANiqp3P+voxtBsOlQoHy3PlqDKJmBfB/Wmookx Q+Pea2Ei5Lsb6dFprLh8nDj2rh4p0jfJ/akHoDVPlEpfN5rvNmWdG2/8KgCw7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787549845; a=rsa-sha256; cv=none; b=gHduZDePTOH8uZzmEoJzJ2GbgAHU1o4AY/AasBHdGFhlH5pdP829JFJlTD5YVfD96Zz3K3 g4Uo+MoScEzn9LfAivCrU9xdobZsA/wgIGts38gJnWOXdGfuH2b/oOXGp6Dd60+O/BjJ8u 7nizJYqP7IqdJIPnsmFAFKhO5ZviOvV17oJNN8U5b3J3eby6bsTBYNnGBpWeB978RZ0GMc Trd5RTiov2zTAKGRU+kg4hi+AOfuEpbFx/ht/6oONMKqU0AQEzZ5ecB/GNqkmE+L3OuFS7 l1HbkW9qn26cTxRclCcBsDF9uEsrV3lSmNmM4xIeBR19R7DoLhF2aUh3zpQHww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787549845; 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=2G1/I7yoBzFJ7Qg7MnyRYsLJimug7ETrgzMENgQrNhM=; b=ceUcN8Q6/0Lu+ja3vmN8uYcmqvEj6g2i8CelWn3rA5sakSv4rEdzwsug5/KEKlWUrJhOoS wFtXwqANpLJmFZOzipVQCjGp+1DTB3/ElzZ2oS1FxcpWGMv0+yQtja5BDY/JlloDtVIdHI dTW41+HY+YUy9f10PuPPyLB5sLkj50k6VdHQzBKuAfKvbnl2DO9jd5A4gA8RBKK1WF2gYB 7UzJq8gy4evHNpz+ex8wKZJwy1C1GmO/H55ugHs3o0Q6qb/54VgXREe4e9ZoU7bStH77Lj ifW97vFmhYuLAP0lE6pY2Nm4Ym99Xh6dacjYHU2eQ3Y7lFbWNR4UDj7SaGHr+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hT06Y3CyMzrxY for ; Mon, 24 Aug 2026 05:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32615 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 05:37:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 008259bb8355 - stable/15 - ipfilter: Fix checksum update for NAT_DIVERTOUT 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 List-Id: 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 008259bb83551cf3d61f273b9bab682e00fa7940 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 05:37:20 +0000 Message-Id: <6a8bd890.32615.5f7df4ff@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=008259bb83551cf3d61f273b9bab682e00fa7940 commit 008259bb83551cf3d61f273b9bab682e00fa7940 Author: Cy Schubert AuthorDate: 2026-08-17 23:23:32 +0000 Commit: Cy Schubert CommitDate: 2026-08-24 05:35:13 +0000 ipfilter: Fix checksum update for NAT_DIVERTOUT When taking a snapshot of the before ip_len (s1) for comparison with the after-translated ip_len (s2), we must convert it from network to host byte order before we can use it. Add the missing ntohs() call. PR: 296944 MFC after: 3 days (cherry picked from commit c08a97fa27b914988ef092352872b2f455abb7c3) --- sys/netpfil/ipfilter/netinet/ip_nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c index bf091e3b0e12..9ee1c5d24ed1 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -5147,7 +5147,7 @@ ipf_nat_out(fr_info_t *fin, nat_t *nat, int natadd, u_32_t nflags) ip_fillid(ip, V_ip_random_id); s2 = ntohs(ip->ip_id); - s1 = ip->ip_len; + s1 = ntohs(ip->ip_len); ip->ip_len = ntohs(ip->ip_len); ip->ip_len += fin->fin_plen; ip->ip_len = htons(ip->ip_len);