From nobody Wed Jul 9 15:40:26 2025 X-Original-To: dev-commits-src-main@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 4bchy33DFmz60ZxM; Wed, 09 Jul 2025 15:40:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bchy31dlXz3ZHt; Wed, 09 Jul 2025 15:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075627; 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=i1JVXmoukUIxYFi1Bdo3kOSxZ+egSBY3uxPMhcEmLMo=; b=qCZia2qJi52RcCxPWHMbraKfIS8EteoQIY9abknJvB3ZuNM3mhmWxZ4W+rgErUNyDqV/xX u3QStUtqBGWTLDc0JTJ9UVpXo6U0B5wLB3W83oHBaaCR6aZ9svdVuOAvXMfAA4IdHSwfur Hhj8gh1t693jdGAtbjjPBaMgpxclyLKXJJtoKtc1j0I4InXE1RRr7uHU5g1zHIwD+Ar9So nSStGOCdbhGOeimebpmRf3LjlM6WagTA7DwHb3YPKl7TBWdHVkWgqkWNTss3Rlib/QzhCc dhrXGHjybPKTd0E2hDc+BAjCbV0/+ALcTxi9qzo3WA2EmbgPCllNmu3mHeBP6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075627; 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=i1JVXmoukUIxYFi1Bdo3kOSxZ+egSBY3uxPMhcEmLMo=; b=sXz22MVGmNaCSZ/Km1pdAFrBIzh7JV/J+zBoHVSALzj1k7OxjcKb8r+oPyEcsAhOl7lxjH SFGX4nPJUjkGsjP0LFHC5SAXEQF5G+r1G7QUbg5S4ZdPx3qzqOYiV4gK3Jm3L+6s1aKi4r IrarNERC6pmdoUAPdh7yq8CAdrgKkzbbEmsQPFJIIQkricBXyPd1F/ou912OxOaCcyRTaV wfwntRUInhyDH0X3j01s+WzZ2zjR2Rlei80WjncXaNri2vgG8hfBryTKAcMgdAQWtRKoVd Qn+H5RPzR+FTkp3BERx6Cx/vsvjze7XCrL2nMfPXWQhyszJPbG2PMFn5CN+TCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752075627; a=rsa-sha256; cv=none; b=pOKjsucdggmIrBSg/3+fF+gIpHmI5qUyxS7dVgJIdRYtO8EOGwxn4MC8eeRVkNB7FUJYxN rnPbmen3+DA1klnUloZWKWUNnahmM4l5SIwU20RlI754p3ARdXds0Rc4iO4twmprnvUHz5 K6GMaZd0gNSsss4kauN7pCEw5TvDpoNxmnOqCQVjYc0pRUEoIjtSyLIWEGNGWGeAjr7GOx cOP7PFlVQP2bO1GQx2e2AUeywfIhiKyq6Sqr+aB0X1yI8QoJud+cIBJzhFkPe2JaxVth+8 7F0iZ1450g+b9LQ/4H5Ce0xtmyM5ZjQimdxkpnWKYcfOoDaCEaTX6xvvufatjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bchy26yftzCfK; Wed, 09 Jul 2025 15:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 569FeQAr008481; Wed, 9 Jul 2025 15:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FeQP5008478; Wed, 9 Jul 2025 15:40:26 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:40:26 GMT Message-Id: <202507091540.569FeQP5008478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f651e87be28d - main - pf tests: sync a state with an rtableid that doesn't exist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f651e87be28dd6c3f466dc865b1a036089b892ff Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f651e87be28dd6c3f466dc865b1a036089b892ff commit f651e87be28dd6c3f466dc865b1a036089b892ff Author: Kristof Provost AuthorDate: 2025-07-08 15:14:16 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 15:38:08 +0000 pf tests: sync a state with an rtableid that doesn't exist Create a state with an rtableid (i.e. fib) that doesn't exist on the receiving side. This used to not be handled, and could provoke panics. Create such a situation to ensure we still don't panic. PR: 287981 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/pfsync.sh | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 7f545b43a066..3be4a3024393 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -835,6 +835,90 @@ basic_ipv6_cleanup() pfsynct_cleanup } +atf_test_case "rtable" "cleanup" +rtable_head() +{ + atf_set descr 'Test handling of invalid rtableid' + atf_set require.user root +} + +rtable_body() +{ + pfsynct_init + + epair_sync=$(vnet_mkepair) + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + + vnet_mkjail one ${epair_one}a ${epair_sync}a + vnet_mkjail two ${epair_two}a ${epair_sync}b + + # pfsync interface + jexec one ifconfig ${epair_sync}a 192.0.2.1/24 up + jexec one ifconfig ${epair_one}a 198.51.100.1/24 up + jexec one ifconfig pfsync0 \ + syncdev ${epair_sync}a \ + maxupd 1 \ + up + jexec two ifconfig ${epair_two}a 198.51.100.1/24 up + jexec two ifconfig ${epair_sync}b 192.0.2.2/24 up + jexec two ifconfig pfsync0 \ + syncdev ${epair_sync}b \ + maxupd 1 \ + up + + # Make life easy, give ${epair_two}a the same mac addrss as ${epair_one}a + mac=$(jexec one ifconfig ${epair_one}a | awk '/ether/ { print($2); }') + jexec two ifconfig ${epair_two}a ether ${mac} + + # Enable pf! + jexec one /sbin/sysctl net.fibs=8 + jexec one pfctl -e + pft_set_rules one \ + "set skip on ${epair_sync}a" \ + "pass rtable 3 keep state" + # No extra fibs in two + jexec two pfctl -e + pft_set_rules two \ + "set skip on ${epair_sync}b" \ + "pass keep state" + + ifconfig ${epair_one}b 198.51.100.254/24 up + ifconfig ${epair_two}b 198.51.100.253/24 up + + # Create a new state + env PYTHONPATH=${common_dir} \ + ${common_dir}/pft_ping.py \ + --sendif ${epair_one}b \ + --fromaddr 198.51.100.254 \ + --to 198.51.100.1 \ + --recvif ${epair_one}b + + # Now + jexec one pfctl -ss -vv + sleep 2 + + # Now try to use that state on jail two + env PYTHONPATH=${common_dir} \ + ${common_dir}/pft_ping.py \ + --sendif ${epair_two}b \ + --fromaddr 198.51.100.254 \ + --to 198.51.100.1 \ + --recvif ${epair_two}b + + echo one + jexec one pfctl -ss -vv + jexec one pfctl -sr -vv + echo two + jexec two pfctl -ss -vv + jexec two pfctl -sr -vv +} + +rtable_cleanup() +{ + pfsynct_cleanup +} + route_to_common_head() { pfsync_version=$1 @@ -1134,6 +1218,7 @@ atf_init_test_cases() atf_add_test_case "timeout" atf_add_test_case "basic_ipv6_unicast" atf_add_test_case "basic_ipv6" + atf_add_test_case "rtable" atf_add_test_case "route_to_1301" atf_add_test_case "route_to_1301_bad_ruleset" atf_add_test_case "route_to_1301_bad_rpool"