From nobody Thu Mar 26 01:11:22 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 4fh5MH2zhBz6X3lM for ; Thu, 26 Mar 2026 01:11:23 +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 4fh5MG6Zvdz3FWY for ; Thu, 26 Mar 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487483; 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=Sklz0FvjHcCNJbS/XBQTX8L/9fxvHgMdfCXvFja6tyo=; b=uEVBYD4UpaGK6GatH0qa7vR6FC7kgHYeSaybapnWdGqHsScgccoDH7GyqAOb9VJlpnlnIr gHAoo/VupejakpkgwY1OuH0xHcMOB26V0kPCJhd5HWBVMNOSy+tUdmFyVpxaXDnRjMPYFC pm5abZLqubbOp0qbaeqQcRx5/nZ6KAbKR/sYTw9j7k1lFq6J6hBDmlwsattY8jy3RqBeiL S/WqjpFad7wtfpwSNjrImvScZEGHs1FO4MQSlc4+/Y3ufmNTDacHwSaGIyxPlvxdDbuM2I N8ssVGDdSQNXJcK728+9umDRnga3UOcUT+wBuKWkoLPY0L0qOObu0z3DDazSfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487483; a=rsa-sha256; cv=none; b=TJn3ATAcIfAFmi5klrUPPBQDQ2uvJupCI8W17K5Ew6cn3T6kA9VjP/Z5QbhSGbF1Ns1a88 hT7NsDTW3oJGJ0dGS0wJFIDNRsdfPtWHQsZnSlWN3+QqPq46Hj4yIuujbyziY/ISg/PgfG HcGKN8sq+ZBTTjtCZuraUlZZlJdifllsKBtd2xW56GvByCjQq4CWDP940Sy3RMFfxrKTcU M7tYE4NYdVJt2URXZZW65RAwqEzuUmkHdUqkrSIsgND/+xcd532kFH/XUNRV1V3u40Wl6n PZKtLchbSqUr95irLHMvZs/aNQ/xeSUWTHcbiULxm6hPqi3pglWX9KK7NKKv2A== 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=1774487482; 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=Sklz0FvjHcCNJbS/XBQTX8L/9fxvHgMdfCXvFja6tyo=; b=brwhS1PQK6TvGtn0W/M0gMjjfNBYOoqCtptp14BqLudrZEvdLdFEXS6TU1u3knNjtBkvAw hoZMd0mqV9PKeztPMKR0VQIzIugQ/drIDkoUivcXZy5BA+ng6h9LdssYTNEvstiOAQHE9V VkFMljJVQ4iXAY+nxX33WhmjKyvcrOl/Tz7rtWIr2m94JvgFHLK0AH/wYj1q82udkXczwu RzsnEw3PG6wXZjmqyoR74XJkYVXfhptfrMu0+IZSuNvlC897DhxpDpNJn1lztA4AGawLmX ffO+jgEYbg4BD4ffpRf5X4bryBsnb4rOGmev/u8UlDpH3dcYDD7r4obQ58/b7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5MG6892zVMk for ; Thu, 26 Mar 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 471cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:11:22 +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: b2ed06fb35ca - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: b2ed06fb35ca4ecf8cefb30b8901f5434ab12588 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:11:22 +0000 Message-Id: <69c487ba.471cc.36d6585a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ed06fb35ca4ecf8cefb30b8901f5434ab12588 commit b2ed06fb35ca4ecf8cefb30b8901f5434ab12588 Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Philip Paeps 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" }