From nobody Wed Dec 14 09:20:08 2022 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 4NX8w85hzqz4k8Fp; Wed, 14 Dec 2022 09:20:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NX8w851Nhz3xLJ; Wed, 14 Dec 2022 09:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671009608; 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=VJi9614AdhFX25iZDlLh3TUNBNP6KOz3MmV5o5rWjn4=; b=MABHvpCzXupeSVK4B1t37u23TttjT3cCf+RaZnIaJZN2z5sUI0VEW7zdgDd9lNFC6fZvbC wKUUEu0ENyhXjzUJnSrDcfpga/YTBz6wn44Q920ydWo43Ta5NuQp7OmH0S2TXhtkkGxtP4 a0hgARRGXVjs0l2rx/paLVXMNnmgzDfoQ3YiTxqI/u2IfcD8Bzt9N/aZCCDVUTMsMbM9t5 mkh3xvg9il01Om5+30V58qIvCgk41XJY18OplyqPmPdzgjU3KUSDvFLzeXeqkM3iO/Q0LE yaGfEh8H7SUCG81im++CvqT+CxA6IvL9pqIffn9KW1qXhUAuaQlaKba1UemU5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671009608; 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=VJi9614AdhFX25iZDlLh3TUNBNP6KOz3MmV5o5rWjn4=; b=ll0khICBciQobPyug0t/NrTBLz6rjCYiiElGpD/cWf/0zT6L9W4zJGAoDckUpx+g0wFgvg iqfxXjpY0l+5XEQAEMEaWUzMIzSSx9K+Eq0gwsNKf+MKSUk4aVrJfF0Tou52nPURt3XRnT iPkvl5ngCGjUuvEnjTaS8XKFC9hyspzY1/ouIYM3icH23r2Sqt3PRy5p/Dz3wTJD143iqv IAn2zvvI+tP5F0pXMElwT43PkDZAmaSo0UGbyUvYy7sN+s36pB5H0FAMwIR/9EBAkZACmS H5s/pm/MEh7kKnDGWweKksG6ijU/Pa1SGdjnYqBd5simNi/Z669jWfHzf2lTcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671009608; a=rsa-sha256; cv=none; b=wun87Qmqc1mPFO+SBk4QnDUhks+OVWV7EFj9lrrYtuBEdSpQLfCAnC9VZ6ycYSMwyHPeeu QACIlg2lGW3MaczmSTADrSQS+zefwOKsJzkbQgHIgNIzh7dGEz/o5576RDbgOOy3RC63Km e8grdAAMrcGLvQR8lPW3m1gywkIn9j/+nOZzEmAikloxJCy63IWhs6x/Pk/0+KoRLF4qqQ buxrpqIiF1Lp748IApWIpzbQ7JtOa8qF5XM9dfGR6L73MPX6TuVdBiEcAvfzLloKIiZN86 W59YWrReel3Ngb2h/JkFrGw27P1ZbKkqVlNrDTSWHFz22Rat/ULZAbe1ZSbH8A== 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 4NX8w8397FzpDn; Wed, 14 Dec 2022 09:20:08 +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 2BE9K88V036384; Wed, 14 Dec 2022 09:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BE9K8qb036382; Wed, 14 Dec 2022 09:20:08 GMT (envelope-from git) Date: Wed, 14 Dec 2022 09:20:08 GMT Message-Id: <202212140920.2BE9K8qb036382@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: 654e8d84ec8b - main - pf tests: check that we clean up unused kifs 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 654e8d84ec8bcb3d94cd8de69edecbe1bbd73eb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=654e8d84ec8bcb3d94cd8de69edecbe1bbd73eb8 commit 654e8d84ec8bcb3d94cd8de69edecbe1bbd73eb8 Author: Kristof Provost AuthorDate: 2022-11-30 14:20:41 +0000 Commit: Kristof Provost CommitDate: 2022-12-14 09:19:01 +0000 pf tests: check that we clean up unused kifs The previous commit fixed a memory leak, where we'd fail to clean up removed groups (and interfaces). Check that we now clean those up as expected. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D37570 --- tests/sys/netpfil/pf/names.sh | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index b2102d644312..e3fb3eb56103 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -53,7 +53,51 @@ names_cleanup() pft_cleanup } +atf_test_case "group" "cleanup" +group_head() +{ + atf_set descr 'Test group cleanup, PR257218' + atf_set require.user root +} + +group_body() +{ + pft_init + + vnet_mkjail alcatraz + + if [ -n "$(jexec alcatraz pfctl -sI | grep '^epair$')" ]; + then + atf_fail "Unexpected epair group" + fi + + epair=$(vnet_mkepair) + if [ -n "$(jexec alcatraz pfctl -sI | grep '^epair$')" ]; + then + atf_fail "Unexpected epair group" + fi + + ifconfig ${epair}b vnet alcatraz + if [ -z "$(jexec alcatraz pfctl -sI | grep '^epair$')" ]; + then + atf_fail "Failed to find epair group" + fi + + ifconfig ${epair}a destroy + + if [ -n "$(jexec alcatraz pfctl -sI | grep '^epair$')" ]; + then + atf_fail "Unexpected epair group" + fi +} + +group_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" + atf_add_test_case "group" }