From nobody Thu Mar 26 01:14:58 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 4fh5RQ5RLYz6X45T for ; Thu, 26 Mar 2026 01:14:58 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fh5RQ1P3Nz3JwW for ; Thu, 26 Mar 2026 01:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/YWOmN/vLkZUfgl/yp2UP1lBmb0ikbSr2ArBkSf0VE=; b=scF6Nf6iS4CKQ+wcQTmTlyEAedGhfeEj9yXVgE2SaqUNr0yA+XmSwieF2QbK8jl9EEYG5c 3APTxmRKaxv92OZwCmacoyeINsIyn7EOs/aWyamzHcPjT6ixm1R4cEoO2arYWLrmU7RoWT fl84gwyJr/9J9BsDJf/Z94TQnyZUAjIB6zlaq7JbuQrzL4+8pLHJw+6zrI/RQa3bIxSRDS wG9/0HD5LZaMDdkjo84/oiCOHpYvgydgHGdObIKXpPZIeT8X7/jBx4K4+a0jwJy18yBCG7 QgnG6JQslZTK3ZGCy7zMkq3oxExQWMlK7yzk3+7bbmo4F4Z/2Fk1BzvEIxOrNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487698; a=rsa-sha256; cv=none; b=xq/+P5wuUe+E5srPR7nBusW1M93+xawyA0WJ6R4xjieejLoXpEHIxyISRJOwPq9d5xh8wU ZY5NrE9MDm4wJYBsNdnPU1FvfQw0zUDByhxFT9w0J6GdaXsaZIoYV6DKehNS1ILqyEus3N 4CqiyaORd+x34vSZBGz/g7bkHKEbgeI/eiGieNsGz2kUgsZy9SkD9xlAxJRUVAASsiAUmh 5DApkVjjty9OmWjDeo/I///8Ij66bSqFKM+8t2hlFS9SARQgnORJS2dlpolscUfxdFlQOw 28zNpr8QyaTcBv0fxDj3yjthMNQPv+Jl2qLSXsc5s2k+dHB4cIpomBeXq54h6Q== 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=1774487698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/YWOmN/vLkZUfgl/yp2UP1lBmb0ikbSr2ArBkSf0VE=; b=SASE9M1WHyUGA9+zsRzY8+7YucrINl4ejimluD9kEhjIxsyK3tx4kjH7Ir2J8RA9Ov9xOj Ma27jvl9xDhYZeHmJ8F7hCLoxhwP0yD2KFcV++4CLK7jshnJvJGoaIbUd+C+Ipcnsc6m0c 18ps/wtmEGd2RruTYMHWbLu6EIN4NMVDGObsuN8Hl3vpqDKOuuxTPi4esJ1rC1tE9Z7Y3L gN01NIzz9RUC0GsaEQDN81vJ9Xnd06ftbVfI8hL7aBfURniNg9NLQNmE5pyYFjvq+bL1c+ A9xVFkT/bb2ei8Ddq8X+BfgLj+psY2bvBXLHXpZCZhypCCWhIzZLPbPNOgvJYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5RQ0c9SzTvV for ; Thu, 26 Mar 2026 01:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 193af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:14:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristof Provost From: Philip Paeps Subject: git: 984b570b4953 - releng/14.4 - pf tests: verify that we handle address range rules correctly 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 984b570b4953c6b01083edb94a2eb4e0c5af572e Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:14:58 +0000 Message-Id: <69c48892.193af.53187397@gitrepo.freebsd.org> The branch releng/14.4 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=984b570b4953c6b01083edb94a2eb4e0c5af572e commit 984b570b4953c6b01083edb94a2eb4e0c5af572e Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:10:59 +0000 pf tests: verify that we handle address range rules correctly There's been a problem where rules which differed only in address ranges were considered duplicates and not added. Test for this. Approved by: so Security: FreeBSD-SA:26:09.pf Security: CVE-2026-4748 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit ab74151e8d097b263237942c0b12277098bc9533) (cherry picked from commit 958dbc87e9c59a2e9f83d84115ce03fb96e9b249) --- tests/sys/netpfil/pf/pass_block.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh index 792b73b4a0a5..b91ba7f9ee68 100644 --- a/tests/sys/netpfil/pf/pass_block.sh +++ b/tests/sys/netpfil/pf/pass_block.sh @@ -255,6 +255,43 @@ urpf_cleanup() pft_cleanup } +atf_test_case "addr_range" "cleanup" +addr_range_head() +{ + atf_set descr 'Test rulesets with multiple address ranges' + atf_set require.user root +} + +addr_range_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}b 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}a + jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 -t 1 192.0.2.1 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "block" \ + "pass inet from any to 10.100.100.1 - 10.100.100.20" \ + "pass inet from any to 192.0.2.1 - 192.0.2.10" + +jexec alcatraz pfctl -sr -vv + + atf_check -s exit:0 -o ignore ping -c 1 -t 1 192.0.2.1 +jexec alcatraz pfctl -sr -vv +} + +addr_range_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4" @@ -262,4 +299,5 @@ atf_init_test_cases() atf_add_test_case "noalias" atf_add_test_case "nested_inline" atf_add_test_case "urpf" + atf_add_test_case "addr_range" }