From nobody Wed Oct 08 15:07:06 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 4chbvb1R6Qz69fpT; Wed, 08 Oct 2025 15:07:07 +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 4chbvb0sk4z4JdF; Wed, 08 Oct 2025 15:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759936027; 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=+p0wzfPUy+k2Dkgli391CAj57mrXDMzFShQzrsmr1ys=; b=bOUFAFKcxj5B4iz67++rPHrTXS2i6/RSVWb+OfeEmPXWve+U1uKNVQxqtJXOdv8dzN3YC7 u/WW1XBAT7tK1Hy6VOeTsTHjTXJCpNbPBZAsmQkkSFMNHvh5R1HnRqpqvmuRNZmG9mI4G0 Tu49tmRgT+T4YfJMgBSH2Lbtbg4psG+QNsgf7qizrdyuXlyd3N0cKS+Rt1epi1O5OBZ8p/ i6/Fp2c7m4ThBO/l1z+2u9AHF73pqg9FS0zyLlam+tBJwYKqAE5h99Hhr5UyU9YaPfAYm/ 7Q01sY+QtPAXrZPi5c2J/P8wJL6w2SG4Gk+Uvx/yeFf/1ujHUHJHdKDI6myQkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759936027; 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=+p0wzfPUy+k2Dkgli391CAj57mrXDMzFShQzrsmr1ys=; b=OZvOZG5TBI7x62gll2nQQyRtGgsXbaEAkmWGwenYLM9492fQjfnLZ6aKtkVT/+Fk+p94jT reg+6y78jgk2OvQa5Hjberh0tORCAUXIQGPj/ho+edKqFrmyzoi4xiGX3EFiPcEGYxK6Pu IUk5kmBDbfGo++0fLlxju62BGjDKMd4pA+WWSjNMH6R7FBZAXjiSQ2kRABe6hU3wt3yMgL S3MYT0rst9AlPLtVHDkjl+IpGzvv2rXKkLePG0g0KEwybuNj2BuAUzS9ArEfJuHrXkVfKw qVUu0ufxxoBahV+iyf/DAnvYmC9wdvdrYvKajKAzMrcCjCqYYNY0XbdCH0xPTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759936027; a=rsa-sha256; cv=none; b=Xv2Fqk/4a6WGFw0xB+A8mrshY3B7dRN39oFhcxViaBbQ/pPnQqvDMiW/iEkfCioSjR1yOI TE3T3mv92PxSBtz8bgOUrDbt6KHKpITE8zDeJKNCDUQpcFTkGhGkAzTivIdwJXpMch5Vi+ WJtNrhA8zrEqM8uCfp5o8g/3GmKlSFDSlSYwNKODnXpcI6bnxtF7wEX1llgsc5h/0gfwlG oIkUVzMZPvYFI/wUbka7nHFNnr2yJkkWOjuKYPaV2XC5F3/ad8wf9qOGYjVvZWJJ5uzmEG m/9Jo3jEXJ/xPezeCb9nMBrV6drdUmRti0yO1Tb1Htz6ugZX4zTplNLaibycMA== 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 4chbvb0MMQzcHn; Wed, 08 Oct 2025 15:07:07 +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 598F76wJ040808; Wed, 8 Oct 2025 15:07:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 598F76JW040805; Wed, 8 Oct 2025 15:07:06 GMT (envelope-from git) Date: Wed, 8 Oct 2025 15:07:06 GMT Message-Id: <202510081507.598F76JW040805@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: 170aac934794 - main - tests/mac_portacl: 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: 170aac93479467334062813c1175a80200400b79 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=170aac93479467334062813c1175a80200400b79 commit 170aac93479467334062813c1175a80200400b79 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2025-10-08 14:34:09 +0000 tests/mac_portacl: 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/1855 --- tests/sys/mac/portacl/Makefile | 1 + tests/sys/mac/portacl/misc.sh | 12 ++---------- tests/sys/mac/portacl/nobody_test.sh | 1 + tests/sys/mac/portacl/root_test.sh | 1 + 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile index 856a85d331d5..28c3a5cd71ce 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -8,6 +8,7 @@ TAP_TESTS_SH+= nobody_test TAP_TESTS_SH+= root_test .for t in ${TAP_TESTS_SH} +TEST_METADATA.$t+= required_kmods="mac_portacl" TEST_METADATA.$t+= required_user="root" TEST_METADATA.$t+= timeout="450" TEST_METADATA.$t+= is_exclusive="true" diff --git a/tests/sys/mac/portacl/misc.sh b/tests/sys/mac/portacl/misc.sh index a1b729c87777..4d3f18fce1c1 100644 --- a/tests/sys/mac/portacl/misc.sh +++ b/tests/sys/mac/portacl/misc.sh @@ -1,15 +1,5 @@ #!/bin/sh -sysctl security.mac.portacl >/dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "1..0 # SKIP MAC_PORTACL is unavailable." - exit 0 -fi -if [ $(id -u) -ne 0 ]; then - echo "1..0 # SKIP testcases must be run as root" - exit 0 -fi - ntest=1 check_bind() { @@ -95,6 +85,7 @@ bind_test() { sysctl security.mac.portacl.rules= >/dev/null } +portacl_enabled=$(sysctl -n security.mac.portacl.enabled) reserved_high=$(sysctl -n net.inet.ip.portrange.reservedhigh) suser_exempt=$(sysctl -n security.mac.portacl.suser_exempt) port_high=$(sysctl -n security.mac.portacl.port_high) @@ -103,4 +94,5 @@ restore_settings() { sysctl -n net.inet.ip.portrange.reservedhigh=${reserved_high} >/dev/null sysctl -n security.mac.portacl.suser_exempt=${suser_exempt} >/dev/null sysctl -n security.mac.portacl.port_high=${port_high} >/dev/null + sysctl -n security.mac.portacl.enabled=${portacl_enabled} >/dev/null } diff --git a/tests/sys/mac/portacl/nobody_test.sh b/tests/sys/mac/portacl/nobody_test.sh index 7e64f68113ea..a3f2168dc81d 100644 --- a/tests/sys/mac/portacl/nobody_test.sh +++ b/tests/sys/mac/portacl/nobody_test.sh @@ -13,6 +13,7 @@ trap restore_settings EXIT INT TERM sysctl security.mac.portacl.suser_exempt=1 >/dev/null sysctl net.inet.ip.portrange.reservedhigh=78 >/dev/null +sysctl security.mac.portacl.enabled=1 >/dev/null bind_test fl fl uid nobody tcp 77 bind_test ok ok uid nobody tcp 7777 diff --git a/tests/sys/mac/portacl/root_test.sh b/tests/sys/mac/portacl/root_test.sh index daa5b147b4fa..d8898ff4f80e 100644 --- a/tests/sys/mac/portacl/root_test.sh +++ b/tests/sys/mac/portacl/root_test.sh @@ -10,6 +10,7 @@ echo "1..48" trap restore_settings EXIT INT TERM sysctl security.mac.portacl.suser_exempt=1 >/dev/null +sysctl security.mac.portacl.enabled=1 >/dev/null bind_test ok ok uid root tcp 77 bind_test ok ok uid root tcp 7777