From 45db38554517c7e1b0cc0265113c22f92a0eb494 Mon Sep 17 00:00:00 2001 From: Kristof Provost Date: Sun, 16 May 2021 08:51:54 +0200 Subject: pf tests: More set skip on 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 --- 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 95c6b6f77825..ce7b1900ae00 100644 --- a/tests/sys/netpfil/pf/set_skip.sh +++ b/tests/sys/netpfil/pf/set_skip.sh @@ -117,9 +117,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" } -- cgit v1.2.3