From nobody Fri May 29 16:01:51 2026 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 4gRp5C6DKdz6flSq for ; Fri, 29 May 2026 16:01:51 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRp5C0tnLz3Ht8 for ; Fri, 29 May 2026 16:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070511; 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=UPyxB1+DmC7XwYkDne/fdr1i3coui/Tvg3uKtfNN/gk=; b=l6zvZnZ/U9YTSCUGbo5zeMbn+58/Q2O2DWCLK+MsR58VE+prLRQpnidjGuXPEpMDFe/xmv eEoFyZMmmELMVZFcryOZG/qovqiculYHdiCyQHi30TTYmAK3HSzVrRCeKz/8lem9C3UFM/ AgaI4zJAJEDNRUSNjGmbC+SV19C3lPRnX3HgqWEGr/71vn5YjY7gLv1LjlhGjOvgHOecdc usnFTcZ9oL+JER3db8C/rC5+ea5RNhObf46OzG5PIDmIcHDFf3aqkmrhGJbnZCCaS5K44W iMCXh9FP4XXi3+8SpBfFV3GvODMQrwiovPw9Ztb+lyn37CfEIyoFb2YA6TGVkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070511; a=rsa-sha256; cv=none; b=NAxKNN/yP7c/LVkzxUqRre/NC2jfpdu5+izXnp0RjrWpoZ0uCIQagUyiMGMynvsZ3Yg0Vq peNXo2EjgSXUNbiDhZ9j5ySNuUO6H2Bl73/m5U9fpfV7QjE6rixdC0es3RtRVXZWo/uP+F 9504AJnCWgMHIklxRJGuKL9nExdPb2M0/D/LJnZyrNNzTdAzm/5USWKi0J51ihuCL/WTrr wn2BXfl1pdaZOM7BZc4eG2NNGLqsIq963YrwCvTe+Az7FLraGLj+YViEU174qso8159Z6L /AcfZMaue6hhldgTpMwedN/EsWBMgwl9s1oOlTHKTeL3sUK1ctaTl6vPrDT+2g== 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=1780070511; 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=UPyxB1+DmC7XwYkDne/fdr1i3coui/Tvg3uKtfNN/gk=; b=mFeyjLxv4JUEzFra3FKoEBr9zNRyLqcKDsBXMX6E//QRXtslr3ADRuEb7glRWKN2aL6xxn HHW5av49lA2hrIu6xPpZrE43al8IlX/88RLl74C5WZoaqyQvj7i1EEqnqGTioEuTo1iDdS XUacQ4hhVgPs7MANKHsJUxGR+BP4PTkJWWAWe66EpRGbWUI+0H4Xrhec0G1LV6lwedQoiO /rpAltUccWB9gQykibj82WAjryhLNQ2G3J7G4ylFI4LodlN0tppZPguor9zIkhSOe6nESe 342xThR29jUq3E6RPWw6EUbuJedzUX0bBgc1aNAungHahnNkyTmwmoWQLBi3KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRp5C0DR8zg6k for ; Fri, 29 May 2026 16:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36109 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 888a84ceeded - main - MAC/do: Fix reporting of "mac.do" post-"executable paths" 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 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/main X-Git-Reftype: branch X-Git-Commit: 888a84ceeded9ef69903e352827cdef58163027e Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:01:51 +0000 Message-Id: <6a19b86f.36109.119d6c7b@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=888a84ceeded9ef69903e352827cdef58163027e commit 888a84ceeded9ef69903e352827cdef58163027e Author: Olivier Certner AuthorDate: 2026-04-28 13:17:18 +0000 Commit: Olivier Certner CommitDate: 2026-05-29 15:28:29 +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 --- 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 fb7eb00cd6d5..8ed1f18a8df6 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1560,9 +1560,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)