From nobody Tue Mar 24 06:03:56 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 4ffzxm3Y2Wz6WB3v for ; Tue, 24 Mar 2026 06:03:56 +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 4ffzxm1DMWz3T2v for ; Tue, 24 Mar 2026 06:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774332236; 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=Sz9aXOdNH+dE7tmiT0M95pC43sZ/3qJfB4bIA6OrLOI=; b=HqFisGLKhGAnpjNz4wjOpX05U8x8i8feqLsSiFuldczW8YzvaGqu3tMAf+52o5fuK50+5m RsjxmXm8bTdlT77MJRPtH0u4mQiNwmXOij0gULKAYoweqMfCXCRE014VCVnxxAGFAgH5VP jG1rEVuuT2gAV1LNwYMznq8IW4lR6nKR/y9ekCs1aOGu7amHjBDee82hR+AMJeLLnJr/l7 K7//HO05lH2Ne5c+VC4ptzFn8dhqsKLuTHdibMdsNLPdCZtCL2r3jEDz7y8ojDHfKTJavO rW3JNhTyRk0EWWnwliZnS16dlAFyX+B+StxI0OhR1O5wtWawntdUwYGLi+cQVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774332236; a=rsa-sha256; cv=none; b=lMysrSHrrhbIyaMdoA1521HxP8tRRs2Wo3yGhoigFTxPlLXoqPpx7Hep7yMqj+Ymn/PLkj H4V6JQQe7hme8RjcI3zOPUAW25zzQPzHH37SsKbVPoG38Ok/EymLqyf7Fz8YsSQg8mPcDR +UMTvWLEnx0sMqj2W5s3l94sdX37pzOSvebUtAePfUGjOta57BjmHZ56ltq6YH3xFH72qF H6ODeQ5lp+MeP7W2SVKSzFvE9mycZ740riCnCER6zC9VZUMPW2Ymxm4zKwa+Ea1LbI0hFj kdsQLz6IAd+RrHarZggeZgautF9TjkR/K7m3GWaeg5aNoiiukl/s8ir781yAXw== 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=1774332236; 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=Sz9aXOdNH+dE7tmiT0M95pC43sZ/3qJfB4bIA6OrLOI=; b=aFyw0WQ/64T5p6oORS/LqhDPhUIPmIfGR7MUWtlUJIwJU7y3Nvwd9uR6Z03oWVjYHzhVnd W13CFhhoLXrI5oFbNRzMQ2NsJHSSwUKSdF3tORtKV+xzncrEFa4SLMopfpluAHVDECS4/J 5PksDKjDuGERlTvwK2Ms1k35x/eNZtGElNsfAwaSp3yB3jIm/JtHnu+8f8VGoUn+A+e/XC eVAzVb5bx59LE0azTaOgrZgnwwcF3Eq306vOdBH6IWVV4tQV5gEiLTqTmGhXnL9uiJLCI+ LrRYokMo2zlx68LajysR0re8g06As5G7GoMQhftx5jjauMchCQrLVV3p1sSyuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ffzxm0rVNz1LJ9 for ; Tue, 24 Mar 2026 06:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 06:03:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ab74151e8d09 - main - pf tests: verify that we handle address range rules correctly 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: ab74151e8d097b263237942c0b12277098bc9533 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 06:03:56 +0000 Message-Id: <69c2294c.3e2f4.58d2f16d@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ab74151e8d097b263237942c0b12277098bc9533 commit ab74151e8d097b263237942c0b12277098bc9533 Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Kristof Provost CommitDate: 2026-03-24 04:27:20 +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. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- 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" }