From nobody Tue Aug 18 14:43:01 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 4hPXVs4lHpz6pJQk for ; Tue, 18 Aug 2026 14:43:01 +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 4hPXVs3zMsz3fHJ for ; Tue, 18 Aug 2026 14:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787064181; 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=P3tWezsKzBm9KDlxqejGtxCli4YBijeazgsYcQ4fVtY=; b=qcY2vLf48BhavSBWUg9Z0IMnpPkEvV2C9SRb1hCa3iMpvRpaChbql1AEk+2s8YDoFeRQEu GhAElh0slKXOgQryErTkXX4vLEs2V7T5EBs1HVDJLJKFo2ZfPRkhUyQRz4uIor4pdIuuT1 RzlRtVPLT4wQ/zb88ynuRUXFrPBv2kfCCFmSTpzn7dzENXeCUAwSIZLcNGx6ABe6niiG4T 2YkOeX8/+CpG0khP+DSUBRWJnQc/P2WvLbBGJjBkmi3ZBa+Wq1eD9UfyDxQPmJCD+8DYq4 t6i7OZjZd963IMDA4K7x6sqF+/T7OFxSBCWQVfoHSxAgXjCL4j3PViLM92uarA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787064181; a=rsa-sha256; cv=none; b=R/aEwNtDZOum8QyNgQmVhh9lY+p432nvF3kiXjO1FFVcWrp5OXlDIPksI0kCrwZYqYXd4f Rw+1/+o9A4zFn3JCbxMnmAiuQigIhxHfT0udgYVfO/P4wzLLgYrZesTcX6bVKkefxYXNdc w9iMLCaNJ4amvcu198CTllJ+xcnoAbYD2r1LR7fUmrBdM+83pqQdesdwluRuZPrOsbcg/r DJyTQtDAtJNZiofLuU9gniJ5I9/lxLBFZUabtNgg6p8aU1zFxbD1uh7SMMhz2Lic914n86 BK0wkEdtVuc+3cco9wmYblimk6/hvDjSvfj6TqQYWXnpszpTPRo+ivfmFhCKlw== 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=1787064181; 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=P3tWezsKzBm9KDlxqejGtxCli4YBijeazgsYcQ4fVtY=; b=S+VjoLFqGE0BcfY7X8vXNseJQieu3q/e9BlC9aweq2bttpK9JeeElY/FRVditSqkKm75x9 062By7KY42gxVbL893UNq/wDoxE3w/vfAZ38ajKo5ual56j6b5K5jVskDjTZGg6TaHOJko DAhankxKa04mAKHtHH6rHnzmcc/JcXZRCpRqteTdFbij1fjLMXsINuBxDI4O/PlVtwr/xz /xCTzq23vglAgATXzfXddxqGFMCOiuZ1fZhgTKvSgahgSDo65ToFERif8NQzIPA2DHEFsG HKNZE1qpVkixXUcx+7/vomYBhipiKUBDTcfnFSRT+BomS9x0Jmj+v9Hjlr7CZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPXVs2qVwzpBd for ; Tue, 18 Aug 2026 14:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 14:43:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: c08a97fa27b9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c08a97fa27b914988ef092352872b2f455abb7c3 Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 14:43:01 +0000 Message-Id: <6a846f75.1e8a1.6feb1615@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c08a97fa27b914988ef092352872b2f455abb7c3 commit c08a97fa27b914988ef092352872b2f455abb7c3 Author: Cy Schubert AuthorDate: 2026-08-17 23:23:32 +0000 Commit: Cy Schubert CommitDate: 2026-08-18 14:42:23 +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 --- 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);