From nobody Fri May 29 16:01:53 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 4gRp5F4sdvz6flbd for ; Fri, 29 May 2026 16:01:53 +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 4gRp5F2PBqz3HrX for ; Fri, 29 May 2026 16:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070513; 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=zP/sch5TsaMpErHW3pzU41eq36eSYbzLGpmXQcPe0Yc=; b=q2UiR0flBRSejtxOLAGetdEOwNXXa+4ba9QXemntw4KApKmIA9LcX5VIlgX7q9IQS0siTx mFNEqN8cAfwrlYe3+0TnWI3LupYYK/fDTTKnGDGHiXgiAY1O3zoRv/ea7ZriP7FglpM34j wX0PznJJ507H3R0wLAtAwZJ4BAJj3v0B80k/Bn6Sa3QbVXO6Frlk7Y5cW78HgFknUsqvDy A3zZCL6tHVGjJaH2wWAatYTK3rBUrQisaEmR72XyY+gLDH0RHc3eA3Cfv+WOuaNgTXQ30n XbD4UgGMcDNZQDTnSd7G6uGvHcRu1kQXsGerzdBFwbAvzGQLFEvrHVuO4qCDZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070513; a=rsa-sha256; cv=none; b=uD6zt0et9n71iGLLJAfmeKUJjfvLYbaMo+X7ri74VLKoW2QvBXGG83AdI3wvqKjz0jG/5M Etu9c9atuTD6Cn7pgLN5TN2xJuDOMzmWHXHHfR6vV4u/RipDLqpEVU+9UCszXkX0+q1rxK j5IWPViccwHJxg2rr9udrYXUUAaaOQ1e7Mn0b6DrDj8ckkTiYT4Jr7UsYsh4/Ig0oRDrnY YftWF7MbX5Twg8MdnzZ9//5v0Otjgc7CjjZXdL31sjYTGtE4AmWPENy6d25aH6hlr6rvg/ Io19+CB0XB/I/eLiCf4k3PzI+BLTKqwzZOMzC62ApflZUidvHSk4CJmMhEgA/Q== 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=1780070513; 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=zP/sch5TsaMpErHW3pzU41eq36eSYbzLGpmXQcPe0Yc=; b=DL6zgR/V6yXimVBL5zyuQgRhAHH/FmOxFWcyZUQH+Y5RRmu5SQwak161/dEDoDuGJ2QZAN axTIZX4BKDDjjyOlQ8AZdGXOTuftwMVvs86Ecplcj2F3dAlbUdc07s9yf8SjlAh8wd9fni n4wmnIezFR2QLklWdivc8Fuv9u+5KRBAM5dHXN3pBe5tx4JOXvJEF0j9+pcguMXVYbOzav n1qSQ+iYSF/Q66X1kvP4oxq0eJ0thzVNELt3kycDnQerPA418fqfXMHL+N2f261P763/LH 7oqE5dgmCj7gDbtEMyQ0zb7jhE9fUVA4lay4M+22Wdtmpu3BhBfVMRXJz1JcPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRp5F1qKHzgn4 for ; Fri, 29 May 2026 16:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32eef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:01:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 31ef4ee2e357 - main - MAC/do: Allocate only one default configuration 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: 31ef4ee2e3570b8f438b9b3fb09b3d87c87419ff Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:01:53 +0000 Message-Id: <6a19b871.32eef.6cccea60@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=31ef4ee2e3570b8f438b9b3fb09b3d87c87419ff commit 31ef4ee2e3570b8f438b9b3fb09b3d87c87419ff Author: Olivier Certner AuthorDate: 2026-04-29 13:12:10 +0000 Commit: Olivier Certner CommitDate: 2026-05-29 15:32:44 +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 --- 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 4feff477b18a..125054d15423 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -1358,21 +1358,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 @@ -2521,14 +2519,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); }