From nobody Wed Mar 25 10:54:00 2026 X-Original-To: dev-commits-src-branches@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 4fgkL10ZPNz6W5cD for ; Wed, 25 Mar 2026 10:54:01 +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 4fgkL05XpHz3MP0 for ; Wed, 25 Mar 2026 10:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436040; 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=Snas7YmGPdQI1ar4pMHLmr+yBiN1aSEAy9tjH1JHsC8=; b=qDo1UmdcpVaV5lGu9fq9Q2Hz8vw+z1jrgvo32XNB31bWljcwkBLdWu4/bLct5U6dNrEWtH AuBPhtEs+Fpn6P2qTQwrOgT0aW9QVqJeZhiKvpZYHCJcgEAlWBV2GItx0iDW2fcIKKmmjR wZ0QcXkUqrEIxTwJJBRB40PDtNtScF7UNDcIFTu74UnuZZcj1mq4TX6RIWcSUoE8hYvoDu 8vlEhkaBraVWpQh5ZzkjaKXsykEf6H8Pp27gJWZDgfAW8uCaVUnUO9ID583tTfTXt2TfTf wVIOzE5hq5w5ZoBctrW18cPJZuxAgYiDTmTPAhhNnHXFMrKggVls/yCw8r0Rpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436040; a=rsa-sha256; cv=none; b=N52vyaLbPOWgjFBeELWDTmle4iFQ/mNzaKfSue54Hh9yz8t1EBzQD5zYFQFnCdNURQzsDo Il8YYd7DCf8Lw4X0ppBCFtsU5RRk726pciM4S51ZYSz9v+1+vMW2U2UyVjgp8v9ldJi4x9 oK70apNFjgH6Sf6vCYm2bZRn2L7GMcABWEkvkMCIf9cm45yH2twmmdhODmEvUwZg9BXKs6 I5YlIwFRBqGKFz4isZ4JRcIYZqpGQ4mSxCZ8BNgsedQPBZNYfdAG2AmEik6+CIkfnxMD/l N7PfN8vL5NyryIWdqopTHc9MpnYipH/4v/hJxSLFUlo4rr1ot4DghDAKkWfO7A== 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=1774436040; 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=Snas7YmGPdQI1ar4pMHLmr+yBiN1aSEAy9tjH1JHsC8=; b=qpDy3wknzxRNjdkkhEXHvhK2O/5atQlkSDS07tl+HAA7ngn7mnqpM2OFCxln240fMk/UsA nAn45K2SOpziNhDdng0VTMCj4ye1fLEfa+uXa6iZSN9aEcw0dNZSKYA8+AAptmYApLIyJM iDn0THCKtobsWrfe9obvbBq1ZLfuxWkQGwaEBNSyRshK9AVlhWZMbG01ivVd4wwVEDThQb YsSERJodbwORQF8PG7x6Y+0OP6zmhAacfLjMfo2n0i1/xZhzSPwh3Qdc5ZirVCWXRNeMQG dfPQSnyLPnd9pG91799cN6GeYkykMd79b6UFlVC76NvP8HSNPdU+z5LvUNCJPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL057rqz12hV for ; Wed, 25 Mar 2026 10:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36239 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:54:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6666b2a0e7c2 - stable/13 - pf tests: verify that we handle address range rules correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6666b2a0e7c26e9e0d913955765c7eb252c1b10a Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:54:00 +0000 Message-Id: <69c3bec8.36239.1573e710@gitrepo.freebsd.org> The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6666b2a0e7c26e9e0d913955765c7eb252c1b10a commit 6666b2a0e7c26e9e0d913955765c7eb252c1b10a Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Kristof Provost CommitDate: 2026-03-24 06:15:01 +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") (cherry picked from commit ab74151e8d097b263237942c0b12277098bc9533) --- 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" }