From nobody Mon Aug 24 05:39:30 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 4hT08z0d0bz6X2f8 for ; Mon, 24 Aug 2026 05:39:31 +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 4hT08y6PXWz4MBm for ; Mon, 24 Aug 2026 05:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787549970; 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=CeWV6nFugPxHZkfLuza8LaJOLc2wNt+r2G1wQ6ivOH8=; b=UHrS866wtU6WlgBV1onNjnIwztAsq6sao755YYnI2TIgUNyeL9AvUPB/kMJXxTgHvyDMAq cAj4SZtGkSG03Alkc9Vwx/Q6Qs0scHtKJDxLRvDpGXFCrZtWPTd1TWgM9aOLDYR87vez2b tDFuE/FvAKIXrIpSkXtcjdXYUxgt/GSvjmDT2TARXvnrSRwE4wmqHXzxRUn+TWVIzWpuPi O354wc3iq3/K5l/8OtXwtMEaGCbBUOkfi+5N23eRKMItkz6ao5E49CDPsYyby5k8NYtl+o MXE/Iio53C5KdN9NrxAIG2sODuhu76uWdtB2tTna7TdweIC0uOBb5MPdQH93Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787549970; a=rsa-sha256; cv=none; b=MlcjD95+XZmpIUQoUNyI0X4oekLZV8BFa6wdQkhNQfxeVIBX+D1iZEEbQMkbY8mCuqou3+ DrWoJjFhDZGA0/bXHm635TEogtwQWljq8dcsDkz9yQDJ6lE246SU7fFpJ8CQu1Bp1PFP21 1SDoBBZEhGbLngMVjnKD2J4Iz7Qo1mfM6YfTMSwa79C7hPtsd7eO6NhQKuyEcURaeeZztB 6iwvLTWC7nYPLBjQNjcqZFUuTKNoWmqkUvL9bGvG6ZeT8aWdPUgyMGjWKqU1lpBqEP5P+F MgwfDGeflGGPw1vSLVVvLARN8oCd4N/Q/ElG4lIxsAQ66i5vjdVdXID7/UHnWg== 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=1787549970; 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=CeWV6nFugPxHZkfLuza8LaJOLc2wNt+r2G1wQ6ivOH8=; b=vFGj6AOeq/fxszYE9TUi92rQjO3uEoA6oJTlpbFJPJ+5rFhAu+FNulOr68m/9pA77Dudaz 8gDbdq4kA4Vkn7Yr3eggvnMO+XWcokzvP6DpjTYnrC0clm7tmt7endipZEWbQ3njGwBCyt vYizb1sj70n0m5MhFU2QbIJjySJ34TW/SZBeYRFGU906HId3GPufv8PLDjgEWF24Zf8i6X xypA8BqfCA8PYqqReDOKC+ZzbxxtE9euoZGj3gJd2x8SOPgOlrFN/I5bi+pyQX+Txo0DUt q3eyiOo2MBb88Mh0w2hxiktW8lqy/OoDBTf66olC3phdvy1cCLy4gghQ92zAuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hT08y4Cb3zry8 for ; Mon, 24 Aug 2026 05:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3242c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 05:39:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 9a34256fd915 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9a34256fd915f759fa36df40f776a33b76926546 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 05:39:30 +0000 Message-Id: <6a8bd912.3242c.710b4ee@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9a34256fd915f759fa36df40f776a33b76926546 commit 9a34256fd915f759fa36df40f776a33b76926546 Author: Cy Schubert AuthorDate: 2026-08-17 23:23:32 +0000 Commit: Cy Schubert CommitDate: 2026-08-24 05:37:33 +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 2ca0fee2606d..86e32b3bf750 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -5151,7 +5151,7 @@ ipf_nat_out(fr_info_t *fin, nat_t *nat, int natadd, u_32_t nflags) ip_fillid(ip); 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);