From nobody Tue Oct 13 13:31:03 2026 X-Original-To: dev-commits-src-main@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 4j3wG00DDBz6vFyj for ; Tue, 13 Oct 2026 13:31:04 +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 4j3wFz6mLQz3FkJ for ; Tue, 13 Oct 2026 13:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791898263; 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=UKEY7C8+yDYy3pvLACkt2t2bfKmzkNFndaxbqBOJwzg=; b=Uxl6A1YNYfd23dewX8h3xKr3Fz+a1RGFb9nTadTV2+KgPwHbLCV8SUmd84AorXAoXFjvLl 989Z5KI88WH4Je3Bray9aq+819mN7L4IgKt9dOKMdXdxcpLuSiZGvDizsYXGYGHx2Y1kG9 D5se0NIZ5vB03Kw3cmQMStMcq7DdLH6i6BnCyltA9qudA9cy8ZxFVnRIWc6RUm77uVtzVo hwy9FjVXBdUz0rlRuDxPpLdafJunwubAgRuJ1r8Wv7TNxMN3Fq7sAr3nsifWL/rXferBrU S9H0q23AvFkcWFut2CoYbVTnyaK5pRCgYi+6LQJ0fuXBRW0YzWLYcyrGBByAUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791898263; b=UcwERzPSiMvw1v6/DSU+DQULJ48fI3I6J9wzmNeLYa/1DVVGo8dwOmQAJUW+Gr+VsAv/i2 WJtvfTPkXiE2QUi85OxKNr81OfgSikEuToF2IYXXqGoJwsqZm1EF7fyu6N/ChnwAnP5E/D sz8p1jAt2iiZzdHjrwJsvarvbmbNKNns13+7XlwQOkGTAE+XxvojA/wMzqqQzrpbnzx1Ug tEgR7jOXGW8aQe8RqAr+x/uanP7MFx7hrtf6s/wtDGKxpswWaniX+mdW+nAZJYICYi6V6W Fdc1fNmdhUkde7Qpq9K+dVRZAIfr4M2nZqXNv7X5PBAX4OgW98OylIXhzl60GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791898263; 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=UKEY7C8+yDYy3pvLACkt2t2bfKmzkNFndaxbqBOJwzg=; b=DUxCm4/3TpoMGoMOC188zGbg2I8LvL/izzRy+WjVE2WhbMJNmVJqRltFSEyx2Yse5LceC3 LmyTaylREiX/nuQQsuseeteIZS65PusiQY4Kfl/Maw6/OJxRgcsdRClXTxoGeIiodiYOjc Leov63EW5O8y+O6T6NagcdYPwTELmJirtnNGJvmtP0v7kYhqno0B1smNiMdyWe4Vv3OCtq 49W3V3TVaPmRl6bKCKToYNkH8nAnrNr10UILLVB4RzZky8FjQ42QkAjtEkp28eWt+STuQd qMC55SDdecJKmlKEZZki5DUhzwvnFClD/BvPb3XK9npQqhqwUZ81lQ+ldjHv9g== 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 4j3wFz5r0LzGTK for ; Tue, 13 Oct 2026 13:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41061 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 13:31:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b5219c068fbc - main - pf: first-match-wins for nat rules, even in anchors List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5219c068fbc133dde91d5cf48423e34ce27bd4f Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 13:31:03 +0000 Message-Id: <6ace3297.41061.cbca1da@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b5219c068fbc133dde91d5cf48423e34ce27bd4f commit b5219c068fbc133dde91d5cf48423e34ce27bd4f Author: Kristof Provost AuthorDate: 2026-10-13 12:40:58 +0000 Commit: Kristof Provost CommitDate: 2026-10-13 13:30:25 +0000 pf: first-match-wins for nat rules, even in anchors Ensure we stop evaluating nat rules if we find a match in a nat-anchor. PR: 299320 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_lb.c | 4 ++++ tests/sys/netpfil/pf/nat.sh | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index a01ad3aad55d..c665c13c1e59 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -224,6 +224,10 @@ pf_match_translation_rule(int rs_num, struct pf_test_ctx *ctx, struct pf_krulese r) != PF_TEST_OK) { break; } + /* If we found a match in the anchor we're done. */ + if (ctx->tr != NULL) { + break; + } } r = TAILQ_NEXT(r, entries); } diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 6d68b62b07c1..e7b1367514f9 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -1009,6 +1009,51 @@ first_match_cleanup() pft_cleanup } +atf_test_case "first_match_anchor" "cleanup" +first_match_anchor_head() +{ + atf_set descr 'Test that NAT matches within an anchor are final (PR 299320)' + atf_set require.user root +} + +first_match_anchor_body() +{ + pft_init + + epair_nat=$(vnet_mkepair) + epair_echo=$(vnet_mkepair) + + vnet_mkjail nat ${epair_nat}b ${epair_echo}a + vnet_mkjail echo ${epair_echo}b + + ifconfig ${epair_nat}a 192.0.2.2/24 up + route add -net 198.51.100.0/24 192.0.2.1 + + jexec nat ifconfig ${epair_nat}b 192.0.2.1/24 up + jexec nat ifconfig ${epair_echo}a 198.51.100.1/24 up + jexec nat sysctl net.inet.ip.forwarding=1 + + jexec echo ifconfig ${epair_echo}b 198.51.100.2/24 up + + # Enable pf! + jexec nat pfctl -e + pft_set_rules nat \ + "nat-anchor \"foo\"" \ + "nat on ${epair_echo}a inet from 192.0.2.0/24 to any -> 198.51.100.3" + + echo "nat on ${epair_echo}a inet from 192.0.2.0/24 to any -> 198.51.100.1" | jexec nat pfctl -g -f - -a "foo" + + atf_check -s exit:0 -o ignore ping -c 3 198.51.100.2 + atf_check -s exit:0 -e ignore \ + -o match:"all icmp 198.51.100.1:.*(192.0.2.2:.*) -> 198.51.100.2:8.*" \ + jexec nat pfctl -ss +} + +first_match_anchor_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "exhaust" @@ -1032,4 +1077,5 @@ atf_init_test_cases() atf_add_test_case "empty_pool" atf_add_test_case "dummynet_mask" atf_add_test_case "first_match" + atf_add_test_case "first_match_anchor" }