From nobody Mon Feb 16 19:47:39 2026 X-Original-To: dev-commits-src-all@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 4fFCws0yG1z6SFtP for ; Mon, 16 Feb 2026 19:47:41 +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 4fFCwr1H3vz3p60 for ; Mon, 16 Feb 2026 19:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771271260; 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=EdkPTmCKKZJVfYqD248Pp6y445UHsjFRb3qifp5DjwE=; b=fIsnovdy6PBuulRBD74kipNXewGeUkX7yfVhQZyLcasw69ZQbXQzLvf5bo95T0iji4V+mb 1dxyx6Z4QGehiZguCqQbEAh4PEXkVVwWR9JAxWKD1cl8/zJ24d0nMhcmK5O4Pi318OE7XZ eImqXAqCo6W7Wt2IAhXm7HiN9wCd14jJvcpqZT2b2PXXwYtc9R5ahkai/SS1sIJkIoauno Jza+qXThgUp47qnmeMI6H5mkJ7+t8KT7/hB9il/E5BFu8yKwJs/VNsgztx9Ut4HDTSAr2f Lh48kZMHDJMDlKm59u2oySrq4ogdehMM12yHAI23NP6n6bjXQReOzWslgWqKqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771271260; a=rsa-sha256; cv=none; b=ZhgRTCYwYwg5GZqBGTM1eF0asIcledzoquFf3bmHnH3xFA1DlJDMl7LIck0ZTfU1p/tQjs UnPNXcfBM/UKhiNuj/CRNX85HBsm4tASKV+nGTLnUNMJd1XXPfW16WgnzT7ts/ShPV2J0n mY0DdlSs+nxMcZuOpdNjsFGTzz7h3NIROgtFdLiS0l711gopCMuDyaoTOTAfVoc7stSWMO W/N4joDbX/r5dFtYLbutxSUxKQMohWJ6I5Nqh6cuacCO6eMQc3j9MtC1kAdNSKzVE+aGi2 VF2n+fah88huwLs9ULpa/luQi8p/JsK0qColHIoRkB3zy3tI2fO9GVAwp8Qqpw== 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=1771271260; 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=EdkPTmCKKZJVfYqD248Pp6y445UHsjFRb3qifp5DjwE=; b=EMjLc4wAYEtPbZphrHqSl/4Ef6sYBF8+x7p5fqUns0guivewYjJexOEIgmL6kEF1+8XCvT irI3ajFMH9IBWEEAxA48MWXyZ2ztjiiZ2T5oyDJpXClxLkQ0DAE2WfJU2foSSGI3pxzZRL mP/4+125Gs8fn3WSoXlibnjBZYTrvGYlGgG57tt6cw+jTCTsQOdzLHNLVBi/1AzgYi14Af ZZ8nIc8QgZMYtDGe8TO+iWxOrJ9p8Y5HQCCgjjmrbrjOhISUXXmfR0WYF8QZlmjxI8eVC6 LbIehHd5kVrzRl4b15KBjJnk5Pty/0s4yViAX/Dc0elpxDF7FS9zh/L8AUTbHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFCwq6w4kzdLb for ; Mon, 16 Feb 2026 19:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 19:47:39 +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: b4c9b7d8c7ea - stable/14 - tests/mac_portacl: restore sysctls after modification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b4c9b7d8c7eaf297981b6197f4d3f15631703e36 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 19:47:39 +0000 Message-Id: <6993745b.3fe56.4c9c189b@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c9b7d8c7eaf297981b6197f4d3f15631703e36 commit b4c9b7d8c7eaf297981b6197f4d3f15631703e36 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 19:41:59 +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 (cherry picked from commit 170aac93479467334062813c1175a80200400b79) --- 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 47993fe54c54..a26ff4a7c80a 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -9,6 +9,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" .endfor 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