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 4fgkL01zQYz6W4x3 for ; Wed, 25 Mar 2026 10:54:00 +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 4fgkL0133hz3MMH 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=DNAq84qr07U8I5nUnEJo/pynv11fvVC59tEQSqZGl8Y=; b=L3hHdp5j75t0ElsRjzggVncZz0SVOUBnoxR3NdpHzw4SLmR4eeHzm3mS1bmMOKQ20EihVH TsAMuVlNhCkKlzdWuTtg+KWCeJFJQljrdaxcK/ho+YuZGYIMrVotOi9x8rQ3BkxlBq1jOa S1jahP5y41m24Z7uHJ0uuqYzV+VlefbBNDKVo8UXgZmf3ZX11dOJeVGApm0VRhkkLJX2ZI jP9u3nVfHb+kMiN+edWAnMscG6gcJ+vbvTOpy4G470wIhfm/55xIcxt8tIYUhiWb+7TVnT tRi4dGy0bfE8B8J3U3pPecsGBbNNR1TxyxY0W4uydofh1Rkuc0gWhcidL9Zrjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436040; a=rsa-sha256; cv=none; b=fqwlshPkAm5mzTD5RYqDB5KMeQTyF8UCorqg5NifYvDRS5bJScb3YdhnAqKzJtDBprVFSq /XHd5cxVqttJF9agF6nRo16UffbIIKWG9cnPgX9hyNMSZMFmP4aJJEptHmpFdYuzqCg9Et 0De3PwOnWbI7LmOFtLZ10pcBL03fBRujPs1Y291Mge1K3oaNSz93/1E7b0uRoPi+gj4yLD oAUP7/E8Chmr2YcQZihdBscS4eB9W8yil6GoATUaOMkqokpVxStkjq3Yd9DzXpmKxHKZA4 b8ghQ4v1K6imFkA1es7WkM+WqBlsABwsYsuqEzqb/cE343dHW9bGubC6THfMyA== 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=DNAq84qr07U8I5nUnEJo/pynv11fvVC59tEQSqZGl8Y=; b=AM4hNyouapcIUmO/ruFZhLaBxMtJ6PYaPL1ioJkAqbQ573GGgXNLnsOmfh26HSw2BsRn9S Dy+/ryLBQTxK79oYaMRvnkrsgKdyeXzY9zRFcNFuSG4mOkCR5x4Ao2PxMDrimOJ8uyw/FR BcQzILR3nz16/xIHrH9ZgcNFyX3hqmtCxGf8CksYloob01JspRVKeha/J/iUKIJUwMbAlK jFhBUV1Bt8RNvrCgdJVkK9s4nASlFhDUExZwWX+NSsRo0UnhWBDjHpDqgJaeLWE/+wVgYn m7OsWS7GX0D/wz9PwWvDveJeN20U0QT2veFRr4mRnB9NchxZ5QdpA3LTg0aszw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL00dtPz12N2 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 35cc8 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: 4e007734ff8e - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 4e007734ff8e56eafb457986074206877b49df6e Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:54:00 +0000 Message-Id: <69c3bec8.35cc8.6b40d339@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e007734ff8e56eafb457986074206877b49df6e commit 4e007734ff8e56eafb457986074206877b49df6e Author: Kristof Provost AuthorDate: 2026-03-12 14:23:32 +0000 Commit: Kristof Provost CommitDate: 2026-03-25 07:11:57 +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 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" }