From owner-dev-commits-src-branches@freebsd.org Sun Jan 3 22:18:49 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47DB44C0F66; Sun, 3 Jan 2021 22:18:49 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8CpJ6Rn3z4qty; Sun, 3 Jan 2021 22:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B5FBB749D; Sun, 3 Jan 2021 22:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 103MIm2D020458; Sun, 3 Jan 2021 22:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103MImg8020457; Sun, 3 Jan 2021 22:18:48 GMT (envelope-from git) Date: Sun, 3 Jan 2021 22:18:48 GMT Message-Id: <202101032218.103MImg8020457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9caf8a4a0822 - stable/12 - pf tests: Fix accidental duplication of content 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/12 X-Git-Reftype: branch X-Git-Commit: 9caf8a4a08223ee84cf0e63bde2c42adefe1e5f5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 22:18:50 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9caf8a4a08223ee84cf0e63bde2c42adefe1e5f5 commit 9caf8a4a08223ee84cf0e63bde2c42adefe1e5f5 Author: Kristof Provost AuthorDate: 2019-03-23 01:07:51 +0000 Commit: Kristof Provost CommitDate: 2021-01-03 20:26:49 +0000 pf tests: Fix accidental duplication of content Also use the correct name for the scapy test script. (cherry picked from commit dcccc93ae404ab8ead535efc4ddcd0fe9e3ee612) --- tests/sys/netpfil/pf/icmp.sh | 51 +------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh index 5cc1a769c799..a02cbf45e34c 100755 --- a/tests/sys/netpfil/pf/icmp.sh +++ b/tests/sys/netpfil/pf/icmp.sh @@ -32,56 +32,7 @@ cve_2019_5598_body() "pass in proto udp to 198.51.100.3 port 53" \ "pass out proto udp to 198.51.100.3 port 53" - atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-icmp.py \ - --sendif ${epair_in}a \ - --recvif ${epair_out}a \ - --src 192.0.2.1 \ - --to 198.51.100.3 -} - -cve_2019_5598_cleanup() -{ - pft_cleanup -} - -atf_init_test_cases() -{ - atf_add_test_case "cve_2019_5598" -} -# $FreeBSD$ - -. $(atf_get_srcdir)/utils.subr - -atf_test_case "cve_2019_5598" "cleanup" -cve_2019_5598_head() -{ - atf_set descr 'Test CVE-2019-5598' - atf_set require.user root - atf_set require.progs scapy -} - -cve_2019_5598_body() -{ - pft_init - - epair_in=$(vnet_mkepair) - epair_out=$(vnet_mkepair) - ifconfig ${epair_in}a 192.0.2.1/24 up - ifconfig ${epair_out}a up - - vnet_mkjail alcatraz ${epair_in}b ${epair_out}b - jexec alcatraz ifconfig ${epair_in}b 192.0.2.2/24 up - jexec alcatraz ifconfig ${epair_out}b 198.51.100.2/24 up - jexec alcatraz sysctl net.inet.ip.forwarding=1 - jexec alcatraz arp -s 198.51.100.3 00:01:02:03:04:05 - route add -net 198.51.100.0/24 192.0.2.2 - - jexec alcatraz pfctl -e - pft_set_rules alcatraz "block all" \ - "pass in proto udp to 198.51.100.3 port 53" \ - "pass out proto udp to 198.51.100.3 port 53" - - atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-icmp.py \ + atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-5598.py \ --sendif ${epair_in}a \ --recvif ${epair_out}a \ --src 192.0.2.1 \