From nobody Mon Jun 29 19:25:57 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 4gpx8Q5xWNz6jjXG for ; Mon, 29 Jun 2026 19:25:58 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpx8Q12yJz40c0 for ; Mon, 29 Jun 2026 19:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782761158; 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=TaruqlurgJgn2AciRInmjalToMyTw8I9a3lMK/+F6EM=; b=ug8sOhn7ZRd9cNx+bexdAvnwlZBA7C03UDijyE5PO5kxlLBpXH30q1z/6A/qT+02Lzu+qH dIVJAKyPq9TTtnUsPliKyMdi1zDHFNXpV3+DeIcwyuat6zdpcQUWNac6mZul70DP4bO5z2 MTFBXTDkoJpRS3mUnZW+6+FP5F0sZ3hZV8TKGfg9WrDKT2IaZczhoQLsbTiCXviLhrfCdW ILiifQAdYpIW9l7ZqbjZAKwOf2N+5tR2168x4PJi2mOQ+NX5fe9BneMlQEyCLjbeWm03cq 6mGI1juUQNbUqg4ksND/+vr7g/64c1xQSPp78x4DK110nklw8Jh0F2hf76QipQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782761158; a=rsa-sha256; cv=none; b=xShXLg3Y7zwvJ/9YbfBgLyVtpCCcD8gGLxvpi6FsM/v4QD4bG8obkM1aPJHUBDSp9kirpP 0YAyl5lU2MI+Frs98agXGPCg8QTW7uJMfGNRqAE/NzaHsbuFo7QeHY4DiHxoTsBi6PNlpT j1AXYw4lcIGWBeSQ/CF6N4+fZe/+gMt+iKXPspE9JY1XQW5hAwWndff502dOTIhPsq38vH olhYUaCX1V5GoHM04jmmIMTkP0aXD7W/MiX7R7bsJswAnqBkpX5ATVRMQMVQVMCL8EN6Rf p3C7f6ky+GP1dDUmnRBRtCCEEQ8VRxCSUt0vRT/mFgmRCGwt1x6fWtZTWde1pg== 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=1782761158; 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=TaruqlurgJgn2AciRInmjalToMyTw8I9a3lMK/+F6EM=; b=UNCEcUXQEpoKd7KjSecyM2GQ/DySL5UNMIln9/xlXU/dom8HGdTIhUSJiwGCGXl5RCbGOB SNdhWFZz4usyyghRav4TPTgtc6D6yGUmulxN/ILzBZPnvAEVCbe5VJ2b4gXuvsR2fmgRD7 642kVWZyLgFZr/FOeAXUE9u7ntXgBeBRdhlEGpqQ8CfK+g/1H+sM5TXhVd/HDfgU1dPAYc +SRvppVadio9ft+99svz7g9NvrA/7U/sQSwlhzWDsPgFJr5JQ5owOaFR/YRrzpQFS2T7En aSdcW0TqgPHCOIWWNCMbWv9KS/0A1HB6nMPItMArVaMoYzVkcr6PdvtR980iTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpx8P5GXNz19Nq for ; Mon, 29 Jun 2026 19:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 208c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 19:25:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: ab2f2f1f75c0 - stable/15 - MAC/do: Fix reporting of "mac.do" post-"executable paths" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab2f2f1f75c0617963fdc745ecffbcfa4f2854ec Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 19:25:57 +0000 Message-Id: <6a42c6c5.208c5.7af935da@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ab2f2f1f75c0617963fdc745ecffbcfa4f2854ec commit ab2f2f1f75c0617963fdc745ecffbcfa4f2854ec Author: Olivier Certner AuthorDate: 2026-04-28 13:17:18 +0000 Commit: Olivier Certner CommitDate: 2026-06-29 19:23:51 +0000 MAC/do: Fix reporting of "mac.do" post-"executable paths" In mac_do_jail_get(), computation of 'jsys' had not been updated to take into account executable paths. Reviewed by: bapt Fixes: 9818224174c4 ("MAC/do: Executable paths feature (GSoC 2025's final state)") MFC after: 1 month Sponsored by: The FreeBSD Foundation Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/38 (cherry picked from commit 888a84ceeded9ef69903e352827cdef58163027e) --- sys/security/mac_do/mac_do.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 33e655a854a4..f298ad2d4f59 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1562,9 +1562,8 @@ mac_do_jail_get(void *obj, void *data) const struct exec_paths *const exec_paths = &applicable_conf->exec_paths; int jsys, error; - jsys = hpr == pr ? - (STAILQ_EMPTY(&rules->head) ? JAIL_SYS_DISABLE : JAIL_SYS_NEW) : - JAIL_SYS_INHERIT; + jsys = hpr == pr ? (has_rules(rules) && has_exec_paths(exec_paths) ? + JAIL_SYS_NEW : JAIL_SYS_DISABLE) : JAIL_SYS_INHERIT; error = vfs_setopt(opts, "mac.do", &jsys, sizeof(jsys)); if (error != 0 && error != ENOENT)