From nobody Wed Oct 8 15:07:08 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 4chbvc2WK1z69ftC; Wed, 08 Oct 2025 15:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chbvc1scSz4JZy; Wed, 08 Oct 2025 15:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759936028; 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=5TEn5+0OTg5UZVmwyRsX5YCQxen485qTtPcYhuwCySA=; b=TofmrQiyQPxk0GFHvoZw90fQJjnmGPsvLtk5HECM5mexHqhYcyOJPxILHYEP/qZGVH5tvS WeHaLdnGz8C6X6F9VP8a1TPSi+QKmYaZYr7PqpAclIkGLz36JRYBUxae3cZdhuewjENJsz EoyZzlzquxFgLxGzfs5Bp7mW+w6n3MPnONmTlNm2kCeo73DP7BDutlM1lY0poiQGyKipQk SSRP2Gvu2b0cMBmuCCiY3bwc/Ey3e3nSrkOngqALy4EM8Nzqz4V9hpQpnvIz82fx/o7YqE 5L3CNXeqPWxyG/P6XMachIKFEyNExMKZaMEypU0fLb9jPYDn6/jJSiy+bOGAiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759936028; 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=5TEn5+0OTg5UZVmwyRsX5YCQxen485qTtPcYhuwCySA=; b=toQ1IlGPDW7usjatWar2UkRF9hMgb8s/H28GQpidQVD2pOH+UY927D02WpSd2nfaZGA7DX Cot0dxCZHQb3oeOPGkkBCJ1UdN+kAOnR5LB3080fZlhg1do2pRN+USXBR1mJdnozdXUjiW Odjc3h81m64AazK5ORa2PKqKTPhgQw9b1zMFW6zMwbhtx9jr6K4mA6n92OFa6Lb2UqAyw/ cCWj96dbmdrJ+hx2cjUokKEfIPX/Qg/xePkbdmHx6kT3pjZFB6SqcoZ9qp3iitOCkayrxG psPHP8vILr4B20hqr10htXvE/JqGJ7VYMdV034VC2agilIXm0UCYIWTjRrhQKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759936028; a=rsa-sha256; cv=none; b=rJr3U8M2jVm/bTSEXzv0cjcIU+23nIEibtxmUVoVFib8DsZObhdRG8LGBpxqiEYFbXk1/G jt/gFmF25dgOkxjdh7d6/48LCLvADdRnkHlC/bevzlLINTGRhFaO/o8DTyJqU5z+c33DQ9 bAR4BJdRs9mTCxg6fBLZM4vL8nvz5jXy5irmFTG9bfCQ5qNxCgCfB8cDBUuC1EWszWXLc3 +B7utJ9hHFihro1WuZ9wk2i1jn/v9/pqOebVeIe6REyHwRkEgCdhYZaS2nc4EOkkwG97LA jIIzTOwfCnTP0mjnqudj8vSTQqR1eJmwtfeZHXtYSHaIKc5l1wFvcPGEFiRLQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chbvc1KLdzcpS; Wed, 08 Oct 2025 15:07:08 +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 598F78i0040841; Wed, 8 Oct 2025 15:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 598F78rg040838; Wed, 8 Oct 2025 15:07:08 GMT (envelope-from git) Date: Wed, 8 Oct 2025 15:07:08 GMT Message-Id: <202510081507.598F78rg040838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 79042fd7ed41 - main - tests/mac_ipacl: restore sysctls after modification 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79042fd7ed4187d2a74e37618f6fd77f448ca353 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=79042fd7ed4187d2a74e37618f6fd77f448ca353 commit 79042fd7ed4187d2a74e37618f6fd77f448ca353 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2025-10-08 14:34:41 +0000 tests/mac_ipacl: restore sysctls after modification While here, use 'required_kmods' instead of ad-hoc checks. Signed-off-by: Siva Mahadevan Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull request: https://github.com/freebsd/freebsd-src/pull/1856 --- tests/sys/mac/ipacl/Makefile | 5 +++++ tests/sys/mac/ipacl/ipacl_test.sh | 16 ++++++++++++---- tests/sys/mac/ipacl/utils.subr | 4 ---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/sys/mac/ipacl/Makefile b/tests/sys/mac/ipacl/Makefile index e083f6c1a69c..93b29e250ea5 100644 --- a/tests/sys/mac/ipacl/Makefile +++ b/tests/sys/mac/ipacl/Makefile @@ -6,4 +6,9 @@ ATF_TESTS_SH+= ipacl_test ${PACKAGE}FILES+= utils.subr +.for t in ${ATF_TESTS_SH} +TEST_METADATA.$t+= required_kmods="mac_ipacl" +TEST_METADATA.$t+= is_exclusive="true" +.endfor + .include diff --git a/tests/sys/mac/ipacl/ipacl_test.sh b/tests/sys/mac/ipacl/ipacl_test.sh index 0de1b414857b..892f4c154b66 100644 --- a/tests/sys/mac/ipacl/ipacl_test.sh +++ b/tests/sys/mac/ipacl/ipacl_test.sh @@ -40,6 +40,9 @@ ipacl_v4_body() { ipacl_test_init + prev_ipacl_ipv4="$(sysctl -n security.mac.ipacl.ipv4)" + prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)" + epairA=$(vnet_mkepair) epairB=$(vnet_mkepair) epairC=$(vnet_mkepair) @@ -130,8 +133,9 @@ ipacl_v4_body() atf_check -s not-exit:0 -e ignore \ jexec A ifconfig ${epairA}b 203.0.113.1/24 up - # Reset rules OID. - sysctl security.mac.ipacl.rules= + # Reset sysctls. + sysctl security.mac.ipacl.rules="${prev_ipacl_rules}" + sysctl security.mac.ipacl.ipv4="${prev_ipacl_ipv4}" } ipacl_v4_cleanup() @@ -151,6 +155,9 @@ ipacl_v6_body() { ipacl_test_init + prev_ipacl_ipv6="$(sysctl -n security.mac.ipacl.ipv6)" + prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)" + epairA=$(vnet_mkepair) epairB=$(vnet_mkepair) epairC=$(vnet_mkepair) @@ -265,8 +272,9 @@ ipacl_v6_body() atf_check -s not-exit:0 -e ignore jexec A ifconfig \ ${epairA}b inet6 2001:db8::abcd/32 up - # Reset rules OID. - sysctl security.mac.ipacl.rules= + # Reset sysctls. + sysctl security.mac.ipacl.rules="${prev_ipacl_rules}" + sysctl security.mac.ipacl.ipv6="${prev_ipacl_ipv6}" } ipacl_v6_cleanup() diff --git a/tests/sys/mac/ipacl/utils.subr b/tests/sys/mac/ipacl/utils.subr index 1d80414bafea..2fff8b1862da 100644 --- a/tests/sys/mac/ipacl/utils.subr +++ b/tests/sys/mac/ipacl/utils.subr @@ -5,10 +5,6 @@ ipacl_test_init() { vnet_init - - if ! kldstat -q -m mac_ipacl; then - atf_skip "mac_ipacl is not loaded" - fi } ipacl_test_cleanup()