git: b2ed06fb35ca - releng/15.0 - pf tests: verify that we handle address range rules correctly

The branch releng/15.0 has been updated by philip:

URL: https://cgit.FreeBSD.org/src/commit/?id=b2ed06fb35ca4ecf8cefb30b8901f5434ab12588

commit b2ed06fb35ca4ecf8cefb30b8901f5434ab12588
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2026-03-12 14:23:32 +0000
Commit:     Philip Paeps <philip@FreeBSD.org>
CommitDate: 2026-03-25 16:06:17 +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 4e007734ff8e56eafb457986074206877b49df6e)
---
 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 e955068d014b..f6d973de7cf4 100644
--- a/tests/sys/netpfil/pf/pass_block.sh
+++ b/tests/sys/netpfil/pf/pass_block.sh
@@ -451,6 +451,43 @@ any_if_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 "enable_disable"
@@ -462,4 +499,5 @@ atf_init_test_cases()
 	atf_add_test_case "received_on"
 	atf_add_test_case "optimize_any"
 	atf_add_test_case "any_if"
+	atf_add_test_case "addr_range"
 }