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:          9818224174 ("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
This commit is contained in:
Olivier Certner
2026-04-29 15:12:10 +02:00
parent 01e2b0ce18
commit 31ef4ee2e3
+12 -12
View File
@@ -1358,21 +1358,19 @@ set_conf(struct prison *const pr, struct conf *const conf)
drop_conf(old_conf); drop_conf(old_conf);
} }
/* static struct conf *
* Assigns the default configuration to a jail. new_default_conf(void)
*/
static void
set_default_conf(struct prison *const pr)
{ {
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); 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; conf->exec_paths.exec_path_count = 1;
set_conf(pr, conf); return (conf);
drop_conf(conf);
} }
static void static void
@@ -2521,14 +2519,16 @@ mac_do_setcred_exit(void)
static void static void
mac_do_init(struct mac_policy_conf *mpc) mac_do_init(struct mac_policy_conf *mpc)
{ {
struct conf *const default_conf = new_default_conf();
struct prison *pr; struct prison *pr;
osd_jail_slot = osd_jail_register(dealloc_jail_osd, osd_methods); osd_jail_slot = osd_jail_register(dealloc_jail_osd, osd_methods);
set_default_conf(&prison0); set_conf(&prison0, default_conf);
sx_slock(&allprison_lock); sx_slock(&allprison_lock);
TAILQ_FOREACH(pr, &allprison, pr_list) TAILQ_FOREACH(pr, &allprison, pr_list)
set_default_conf(pr); set_conf(pr, default_conf);
sx_sunlock(&allprison_lock); sx_sunlock(&allprison_lock);
drop_conf(default_conf);
osd_thread_slot = osd_thread_register(dealloc_thread_osd); osd_thread_slot = osd_thread_register(dealloc_thread_osd);
} }