From nobody Thu Mar 26 01:16:04 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 4fh5Sh6x23z6X4J0 for ; Thu, 26 Mar 2026 01:16: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fh5Sh1bGTz3Lmy for ; Thu, 26 Mar 2026 01:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487764; 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=2shwkYngyDev0/3LWLSq4dq5fNBlWnwdhmHxEayZyB0=; b=eWc8KB9lJ4E2j0Chmpp00jpfxeo2QcY5Y0zHvTkFSRyJ02ZnERybkI4oRdlQeJVEwYcClr NtZfmJCzcmUPTgDMkMvX9is5ZDj5eI2kTlSE29NFmOLnjsgArM1dU4fxZp5P4NMaDnvFBt S2yeyuH+VAF0wgnN4hwQ+tHYMY8BZH2apq3BG/nlgRz6g1ZQc8GXYWK+4/F/y+76+4FCqH FeLn5QUd3frmjVQsKpjzQoRDjJkJYdghOKwDM38f0mx2MrPQ5EwNaZisAAw1tE5JH4IJtg nlA+i4M+6EO3sPZQfkM/eGdK/hOpXQ0oVdWoANPVe47EBTR5+kBdhAqbdf98qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487764; a=rsa-sha256; cv=none; b=SMHsWB8JzIlXxQykFI3A0E9r/XYu9AaBKQY5fuVM7eol/Er8KxVEdjrJVGOHASkIhfRb+g hxXmcCmKIJKoAB/Jr2ZwlvRacORitN9yO4SkBSw5JzBIWx5hP5/irqGmBgCR19bGRw7ZeE 8fe0zC6s7BzMAQm1cBtsdDYshtjENN+Bc38jQ5WMMZByBrxq+F3Hqfus3mNuwBLO35XPHW AX88H1wLkOsuby3OX73cKozLi/l4+FDDJ6HVPIzwDckkN+9CidSe+vEb3RiB6qvP0RpwpL 880550wH1AiGNXfWkOXebp1+TTFjHvJvA1oCnVlgUDy2G7aLtUWst61l9txsTQ== 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=1774487764; 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=2shwkYngyDev0/3LWLSq4dq5fNBlWnwdhmHxEayZyB0=; b=P+a3yd1N7oB3dfBoYbNMslVJqxzMW2k3EYxmkXZtLvq7pmtdJWTCLsYsSh0lAbXucbg5bD BqvExEo0W841KXCYSbILLMr8eW0FlUewploysCJzuvzMttDZwlnQManG+Nbyrx15LiWDSZ NNuH9uKtB6gwH2iaWyxVoIYM0EMPr9bAJh8yBUSl+MGVI23JB2j84+A92YV+1AZSC741BZ dca6kZY2HP9duE079Kge1BY8Ta15U2XZvwG6PDlXLNX8yOBpek+7xBdVghTD1bSl77AuSU 7jnouk5y7kcgPIz4TQxMmA5qdecvSLZUqcxGwT9IuyBqo7l7TV7CzWHwb5WGlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5Sh0gFvzVc3 for ; Thu, 26 Mar 2026 01:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:16:04 +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: 89ab511c1ce2 - releng/14.3 - 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.3 X-Git-Reftype: branch X-Git-Commit: 89ab511c1ce2a979b5d0e7fdbb3289442b35d8a3 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:16:04 +0000 Message-Id: <69c488d4.18f9b.32a95ae5@gitrepo.freebsd.org> The branch releng/14.3 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=89ab511c1ce2a979b5d0e7fdbb3289442b35d8a3 commit 89ab511c1ce2a979b5d0e7fdbb3289442b35d8a3 Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:13:33 +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" }