From nobody Mon Jun 29 19:25:59 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 4gpx8S5pPTz6jjXJ for ; Mon, 29 Jun 2026 19:26:00 +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 4gpx8S0m4Dz40cR for ; Mon, 29 Jun 2026 19:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782761160; 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=rZLG+yYaE8N8+SKvJteTtH7qdPCZRgg0HJL9RAM6MOU=; b=ddueXVnZIuBWnks8wYT/hAFPVLRcwV4QW3qglRJhonsFWoye4VxW+SLVEKrpm52bvuqjms vjePp1RALDocF4aYcw5YsFSbYSqIcyPMLpKkHAwY21lM661Q5591lOB6vIyolzTp3DOqkP zZLNqP/j3pAhOqOak28wtBKdEbwN+HyUNLdyTb/DKddQCro2uQzahYXEm6cd6kUn9lWGXK OglxollJPhVxEfaR6x15nAZHhIqFtPNSmzKDgzZ9QnvFv8XarB1YAvwXNimMWs/et49bzv KpC7HP5a5Qp3vKyq8daeRyOsGBaO71NDzrYi4KgbzFdsQOMUVgT7PHOa3fV4zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782761160; a=rsa-sha256; cv=none; b=pylh8Rt+knzt0J5vyufS20bZc9vN8Uosf+kQMTawz0kZs1sUl/L7i+yrLDlo6fPNncNlfZ /RfjHtUs07Pw1PcmfeJh4E1oeA6fEiGjX+N7KHgtz5NfpSeezaQXMiD7VT8qpMLf/wNA3I uXNnCjWMoMJyEA1bulAt4Z1zPlzeU2TK7mkb7KoRsrIfUzGkn4hBbjBjn2jmror24FPLp3 5SFAS6oD4cAcMwUZem00y+aR5V4In0hGhSPe/0y9IPOapQoUuKMt1gmioiBB2skEGtj+nH EpJp8rjwPDhq0PEoPHDIdaC7uRyBu+1k7+IkSPtUjwu2PhAUm/Sry/6RzrtLwA== 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=1782761160; 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=rZLG+yYaE8N8+SKvJteTtH7qdPCZRgg0HJL9RAM6MOU=; b=R5G0UTdf6yvl5aMOU57WR2dY8U3jonAqmoRHtco4kqXyOTTOd1PlzH75JWdGnJ8hn5p28T PnzK83salSA/RqgrqyrcGz0M5+sytxaQ3eio2inh0/fhAFzbmt5x1wvgWVkq1pKUvzv687 W+M+ZqPGjnbNs9fbVeZlpOelv98DrwqbKjW+UNIINBytmqsSxpOsbC4prPfGUIhQc/dgQn vY2wcq33jdC4nCtnR54smQQ9cBvfTpovbC49H2JGYozkBKJLHzyjwDv7/l4IfTEuF4/JbD VLGcRjnkRaJjZ9NOAcwbL3m3g+wDVh/bx3RsmIjswztaeHJbJMkUnovDCjGhbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpx8R6lxpz19cg for ; Mon, 29 Jun 2026 19:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21868 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 19:25:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: ddad09993fdd - stable/15 - MAC/do: Allocate only one default configuration 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: ddad09993fdd606d65611afac7fc987339401e80 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 19:25:59 +0000 Message-Id: <6a42c6c7.21868.176717fb@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ddad09993fdd606d65611afac7fc987339401e80 commit ddad09993fdd606d65611afac7fc987339401e80 Author: Olivier Certner AuthorDate: 2026-04-29 13:12:10 +0000 Commit: Olivier Certner CommitDate: 2026-06-29 19:23:52 +0000 MAC/do: Allocate only one default configuration When mac_do(4) is loaded, all jails get the same default configuration (disabled, with only one allowed executable path: '/usr/bin/mdo'). Share it between all jails instead of creating a separate copy for each. 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 31ef4ee2e3570b8f438b9b3fb09b3d87c87419ff) --- sys/security/mac_do/mac_do.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index f796e1b5cf76..4ba545ec5a19 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1360,21 +1360,19 @@ set_conf(struct prison *const pr, struct conf *const conf) drop_conf(old_conf); } -/* - * Assigns the default configuration to a jail. - */ -static void -set_default_conf(struct prison *const pr) +static struct conf * +new_default_conf(void) { - struct conf *const conf = new_conf(); + const char *const mdo_path = "/usr/bin/mdo"; + struct conf *conf = new_conf(); - strlcpy(conf->exec_paths.exec_paths_str, "/usr/bin/mdo", + strlcpy(conf->exec_paths.exec_paths_str, mdo_path, MAX_EXEC_PATHS_SIZE); - strlcpy(conf->exec_paths.exec_paths[0], "/usr/bin/mdo", PATH_MAX); + strlcpy(conf->exec_paths.exec_paths[0], mdo_path, + PATH_MAX); conf->exec_paths.exec_path_count = 1; - set_conf(pr, conf); - drop_conf(conf); + return (conf); } static void @@ -2523,14 +2521,16 @@ mac_do_setcred_exit(void) static void mac_do_init(struct mac_policy_conf *mpc) { + struct conf *const default_conf = new_default_conf(); struct prison *pr; osd_jail_slot = osd_jail_register(dealloc_jail_osd, osd_methods); - set_default_conf(&prison0); + set_conf(&prison0, default_conf); sx_slock(&allprison_lock); TAILQ_FOREACH(pr, &allprison, pr_list) - set_default_conf(pr); + set_conf(pr, default_conf); sx_sunlock(&allprison_lock); + drop_conf(default_conf); osd_thread_slot = osd_thread_register(dealloc_thread_osd); }