jdcMZ2M2q+/HS10ilE5E3fv7JQopj/byxmdrLOUkoiWFFD7u53OJLMPFTE8hDUMH4CvdQ6 Vx7EELNpNj1XP6gMtNffrTupPozry4Py8cjl2hKTMk+gXu9FRrJbqfbZ5PhejYu20G4KPD m9D9ZhXXi3CPiLzk7OI1dZIQBzP6lQbijDywWViXBKXoKuLPf50GGBRtizIBUayXxSkxx0 3gR9RkQtcgd41wKRf/mEKj5KDK3S7QwGHpaip9SQHiB+0rlS4Akau06lj1jDVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765815919; 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=pPeFY0OLdx9EubYb1AolpxLtLvBRCTHwcs1IkWJlcKA=; b=eNuGqgI2lK2+tE4pZjKE0xxJAaQSukQgMXlEStcOOPfWAQa1Yl+q508Urp26GMoIj9fxFR t30aKipoU7poY4gZ04G44QRATWY/8qSP9gbAXwWDG1obKKWolug1Z4tmspBN115PPxdnyi ERMu4ugW7qorZBVyfWgFM4CNVJt0iH0WeFGJZcqF2jk34HKmnTzRwDApbTs6wBTzcuIxG5 XssvbQcTXuExmxZ2wha7jokkWPVMpUGmUkuMqliCXKQy+Sa0/TMdXAUVCl4ppI+ukFxFrj C72haRYbHv0a2ON3hKDPMCNI9vyvRhbi2ALUXsmjtp1Ikt8k5pvYc1Md89wwKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765815919; a=rsa-sha256; cv=none; b=n9F5rH4ziy4Z43/5+0/+4AMaT//lJwU69vQgqunzRBHthSkWLBAVC7VTFDlaunnUHXYBco mVyvptbZstmBH7gU8jsFmbWH9bHOoPRPHxwBXQUhDmq6MH/4tWxvA/RnwtGaoTnwJ9elgW c9/bIWVNbB8hwRhasYkuTYvib1ANR2kY/xZ4ZKotC5C+73NaPgHZJARetpJblRPJjutgih xFbrJDjONeMVjDjcM90RVlc3Z0DHapYQvTZVcZMiYPhzHTf+TAnly+RTXkCgnKglH2RRke tvHvfvVy9uCZpIuTsVuqFyNFrHXGBiK2GBTzpkJcWvQgAMl4OQeYf+XWWi7adw== 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 4dVQQR4BtLzC3w for ; Mon, 15 Dec 2025 16:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 82ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 16:25:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: cdbc9b76ff49 - main - pf: fix min-ttl and set-tos for nat64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdbc9b76ff4901816b5ebdca5d0b7e9947a015cb Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 16:25:19 +0000 Message-Id: <6940366f.82ed.6630a1b2@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cdbc9b76ff4901816b5ebdca5d0b7e9947a015cb commit cdbc9b76ff4901816b5ebdca5d0b7e9947a015cb Author: Kristof Provost AuthorDate: 2025-12-15 14:26:57 +0000 Commit: Kristof Provost CommitDate: 2025-12-15 16:24:34 +0000 pf: fix min-ttl and set-tos for nat64 If we have both af-to and min-ttl or set-tos on a single rule we didn't apply the new ttl or tos. That's because the scrub code still applied the change, but we subsequently create a new header for the new address family. That's done based on the ttl/tos saved in the struct pf_pdesc, which are the values from the incoming packet, before the scrub modification(s). Also update the struct pf_pdesc values when we update packets. Reported by: Marek Zarychta Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 6 ++-- tests/sys/netpfil/pf/nat64.sh | 69 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 53010222dd07..1362ce5387bb 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2244,14 +2244,14 @@ pf_scrub(struct pf_pdesc *pd) h->ip_ttl < pd->act.min_ttl) { u_int16_t ip_ttl = h->ip_ttl; - h->ip_ttl = pd->act.min_ttl; + pd->ttl = h->ip_ttl = pd->act.min_ttl; h->ip_sum = pf_cksum_fixup(h->ip_sum, ip_ttl, h->ip_ttl, 0); } #ifdef INET6 /* Enforce a minimum ttl, may cause endless packet loops */ if (pd->af == AF_INET6 && pd->act.min_ttl && h6->ip6_hlim < pd->act.min_ttl) - h6->ip6_hlim = pd->act.min_ttl; + pd->ttl = h6->ip6_hlim = pd->act.min_ttl; #endif /* INET6 */ /* Enforce tos */ if (pd->act.flags & PFSTATE_SETTOS) { @@ -2261,6 +2261,7 @@ pf_scrub(struct pf_pdesc *pd) ov = *(u_int16_t *)h; h->ip_tos = pd->act.set_tos | (h->ip_tos & IPTOS_ECN_MASK); + pd->tos = h->ip_tos & ~IPTOS_ECN_MASK; nv = *(u_int16_t *)h; h->ip_sum = pf_cksum_fixup(h->ip_sum, ov, nv, 0); @@ -2270,6 +2271,7 @@ pf_scrub(struct pf_pdesc *pd) case AF_INET6: h6->ip6_flow &= IPV6_FLOWLABEL_MASK | IPV6_VERSION_MASK; h6->ip6_flow |= htonl((pd->act.set_tos | IPV6_ECN(h6)) << 20); + pd->tos = IPV6_DSCP(h6); break; #endif /* INET6 */ } diff --git a/tests/sys/netpfil/pf/nat64.sh b/tests/sys/netpfil/pf/nat64.sh index 6631e3eca2c7..e2a87a6eee40 100644 --- a/tests/sys/netpfil/pf/nat64.sh +++ b/tests/sys/netpfil/pf/nat64.sh @@ -1179,6 +1179,74 @@ v6_gateway_cleanup() pft_cleanup } +atf_test_case "scrub_min_ttl" "cleanup" +scrub_min_ttl_head() +{ + atf_set descr 'Ensure scrub min-ttl applies to nat64 traffic' + atf_set require.user root +} + +scrub_min_ttl_body() +{ + pft_init + + epair=$(vnet_mkepair) + epair_link=$(vnet_mkepair) + epair_link_two=$(vnet_mkepair) + + ifconfig ${epair}a inet6 2001:db8::2/64 up no_dad + route -6 add default 2001:db8::1 + + vnet_mkjail rtr ${epair}b ${epair_link}a + jexec rtr ifconfig ${epair}b inet6 2001:db8::1/64 up no_dad + jexec rtr ifconfig ${epair_link}a 192.0.2.1/24 up + jexec rtr route add default 192.0.2.2 + + vnet_mkjail rtr2 ${epair_link}b ${epair_link_two}a + jexec rtr2 ifconfig ${epair_link}b 192.0.2.2/24 up + jexec rtr2 ifconfig ${epair_link_two}a 198.51.100.2/24 up + jexec rtr2 sysctl net.inet.ip.forwarding=1 + + vnet_mkjail dst ${epair_link_two}b + jexec dst ifconfig ${epair_link_two}b 198.51.100.1/24 up + jexec dst route add default 198.51.100.2 + + # Sanity checks + atf_check -s exit:0 -o ignore \ + ping6 -c 1 2001:db8::1 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 192.0.2.2 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 198.51.100.2 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 198.51.100.1 + + jexec rtr pfctl -e + pft_set_rules rtr \ + "pass" \ + "pass in on ${epair}b inet6 from any to 64:ff9b::/96 af-to inet from (${epair_link}a)" + + # Ping works with a normal TTL + atf_check -s exit:0 -o ignore \ + ping6 -c 1 64:ff9b::198.51.100.1 + + # If we set a TTL of two the packet gets dropped + atf_check -s exit:2 -o ignore \ + ping6 -c 1 -m 2 64:ff9b::198.51.100.1 + + # But if we have pf enforce a minimum ttl of 10 the ping does pass + pft_set_rules rtr \ + "pass" \ + "pass in on ${epair}b inet6 from any to 64:ff9b::/96 af-to inet from (${epair_link}a) scrub (min-ttl 10)" + atf_check -s exit:0 -o ignore \ + ping6 -c 1 -m 2 64:ff9b::198.51.100.1 +} + +scub_min_ttl_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "icmp_echo_in" @@ -1206,4 +1274,5 @@ atf_init_test_cases() atf_add_test_case "route_to" atf_add_test_case "reply_to" atf_add_test_case "v6_gateway" + atf_add_test_case "scrub_min_ttl" }