The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b780106bba6ae8f0259c4d134908787ba58eac5b
commit b780106bba6ae8f0259c4d134908787ba58eac5b Author: Kristof Provost <[email protected]> AuthorDate: 2021-05-16 06:51:54 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2021-05-24 15:40:28 +0000 pf tests: More set skip on <ifgroup> tests Test the specific case reported in PR 255852. Clearing the skip flag on groups was broken because pfctl couldn't work out if a kif was a group or not, because the kernel no longer set the pfik_group pointer. PR: 255852 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30285 (cherry picked from commit 45db38554517c7e1b0cc0265113c22f92a0eb494) --- tests/sys/netpfil/pf/set_skip.sh | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tests/sys/netpfil/pf/set_skip.sh b/tests/sys/netpfil/pf/set_skip.sh index 67ccff70a750..064f85cbc5af 100755 --- a/tests/sys/netpfil/pf/set_skip.sh +++ b/tests/sys/netpfil/pf/set_skip.sh @@ -92,9 +92,55 @@ set_skip_dynamic_cleanup() pft_cleanup } +atf_test_case "pr255852" "cleanup" +pr255852_head() +{ + atf_set descr "PR 255852" + atf_set require.user root +} + +pr255852_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig lo0 127.0.0.1/8 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz "set skip on { lo0, epair }" \ + "block" + jexec alcatraz pfctl -vsI + + # We're skipping on epair, so this should work + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + # Note: flushing avoid the issue + pft_set_rules noflush alcatraz "set skip on { lo0 }" \ + "block" + + jexec alcatraz pfctl -vsI + + # No longer skipping, so this should fail + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +pr255852_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "set_skip_group" atf_add_test_case "set_skip_group_lo" atf_add_test_case "set_skip_dynamic" + atf_add_test_case "pr255852" } _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
