From nobody Mon Feb 16 19:47:38 2026 X-Original-To: dev-commits-src-branches@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 4fFCwq4PBQz6SFlY for ; Mon, 16 Feb 2026 19:47:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFCwq1Mp8z3p8N for ; Mon, 16 Feb 2026 19:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xLISd0UaFkcnrOTSKOwh0X2w0jVzax1QpQYDCNSBtc=; b=FYtwHvGWYDt6QfL6GfRTUq0ohGAbGi7tT4Gt0K9SxIxVN9ePfIk2dXFNZeU+mc3y4nLZbr eKElfieqAWmyXzX1NNILpLQb35vgbTZwr8b9/Vt+6UpZQcl2GDc5dyndMId+scL0xchwPu uL/LgWDn5iSJQL8UYVQxsCKBPErEPTrSsNUJA6O2UDlWeHbopT/J2bIckksVYmeIu6DD2w YxarnEIHW+eBmWTuWq3cC3pfr/TqV9rBRVw/2a08jypNGxRbPNRrcYLfzcUrC8nuVWVh1K gQQbpqNIk+CzV1KGkhzU4hDtDv1WUR7cxVoS1ZMx32swbvrwP5nGr1NbYtyFCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271259; a=rsa-sha256; cv=none; b=TJYRinaFY8EGEkrU5K2L5F7B/XzsKUavr+GYw4X14M2up+tQbrHnSU99Szyenm0KE/+Xsh NV3pZdWVm9mOoE98zrvtliUHMVjaY4TOx/EFt8m/RyoRTxyEpnqsAcEiqmj3FmBTY6SINT JTW/QBMi+0/Y+7WE2CmD0M5HfUG/N+NtUClan0i5Q/58dY+vQao9Rve2v1SvUfAHOO0gAg 00WojNJLEoqe2NLV9R45YihqYWTepKfkfef+6Gk6SMseGYcv6upcIWD2rpyg47u0x/jNqD 9+id2UVg0SxlgmUSpOWAtTJtQlkoK7frqGLHlN9mHT1KpjeLPdC8Ths48aXL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xLISd0UaFkcnrOTSKOwh0X2w0jVzax1QpQYDCNSBtc=; b=c7tGKxjSlSIQMsB6ILv+Jlfk52uZLDxh6LGhxmDSGVnWCclQ1bPzZz/GR8/OyuyzLTIhEx ldzCVXGSN4BJDrMH8fNtPm+O27XSNpA5ghvV2Tyz9V+n1QZlJkkU4cfls12uCDL/8zWu/x 4qgc16auQhYKv305Tj4sYaBUeWydNbY4nzDm0apRVKsVKPKumA5MJxdUOjgDwz3TnSmcYv uDrAJHaUYvayy09ESGDKeod8UuExsE6/L9wfzr1HQilKy1ybvynjYxin5xVtdO/KTNlVDm Fb0URvPqqR+2TQVmgz0sM6VrboyizRE4NoN8vQN+hXwzvqq8hYyiBJ3drItKXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwp6wnhzdhn for ; Mon, 16 Feb 2026 19:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Mark Johnston Subject: git: 30aaec7a23cb - stable/14 - tests/mac_ipacl: restore sysctls after modification List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 30aaec7a23cb580fe7a1e953340e8ae03d340f80 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:38 +0000 Message-Id: <6993745a.3f7fd.2b078b1a@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=30aaec7a23cb580fe7a1e953340e8ae03d340f80 commit 30aaec7a23cb580fe7a1e953340e8ae03d340f80 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 18:41:12 +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 (cherry picked from commit 79042fd7ed4187d2a74e37618f6fd77f448ca353) --- 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 4a5dfaa015c3..bfac10e4655a 100644 --- a/tests/sys/mac/ipacl/Makefile +++ b/tests/sys/mac/ipacl/Makefile @@ -7,4 +7,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()