diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-01-20 21:57:21 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-01-20 22:39:07 +0100 |
commit | 3bdc25a4cfbb8d58d81d10cf8d4362af12b90c80 (patch) | |
tree | 6aff6943dd05dea45937600644ea227e3787e768 /src | |
parent | 7504f599e1331c6e0ba1780a307178fd0a7f4d3a (diff) | |
download | systemd-3bdc25a4cfbb8d58d81d10cf8d4362af12b90c80.tar.gz |
core: make NotifyAccess= in combination with RootDirectory=/RootImage= work
Previously if people enabled RootDirectory=/RootImage= and NotifyAccess=
together, things wouldn't work, they'd have to explicitly add
BindReadOnlyPaths=/run/systemd/notify too.
Let's make this implicit. Since both options are opt-in, if people use
them together it would be pointless not also defining the
BindReadOnlyPaths= entry, in which case we can just do it automatically.
See: #18051
Diffstat (limited to 'src')
-rw-r--r-- | src/core/execute.c | 1 | ||||
-rw-r--r-- | src/core/execute.h | 2 | ||||
-rw-r--r-- | src/core/namespace.c | 20 | ||||
-rw-r--r-- | src/core/namespace.h | 1 | ||||
-rw-r--r-- | src/core/service.c | 5 | ||||
-rw-r--r-- | src/test/test-namespace.c | 1 | ||||
-rw-r--r-- | src/test/test-ns.c | 1 |
7 files changed, 26 insertions, 5 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 38235ec77e..c56a4ef03b 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -3223,6 +3223,7 @@ static int apply_mount_namespace( context->root_verity, propagate_dir, incoming_dir, + root_dir || root_image ? params->notify_socket : NULL, DISSECT_IMAGE_DISCARD_ON_LOOP|DISSECT_IMAGE_RELAX_VAR_CHECK|DISSECT_IMAGE_FSCK, error_path); diff --git a/src/core/execute.h b/src/core/execute.h index 2da4699df1..f8231ba773 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -384,6 +384,8 @@ struct ExecParameters { /* An fd that is closed by the execve(), and thus will result in EOF when the execve() is done */ int exec_fd; + + const char *notify_socket; }; #include "unit.h" diff --git a/src/core/namespace.c b/src/core/namespace.c index 4b5519e11b..12d9e4c867 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -1302,7 +1302,8 @@ static size_t namespace_calculate_mounts( const char* var_tmp_dir, const char *creds_path, const char* log_namespace, - bool setup_propagate) { + bool setup_propagate, + const char* notify_socket) { size_t protect_home_cnt; size_t protect_system_cnt = @@ -1329,7 +1330,6 @@ static size_t namespace_calculate_mounts( n_bind_mounts + n_mount_images + n_temporary_filesystems + - (setup_propagate ? 1 : 0) + /* /run/systemd/incoming */ ns_info->private_dev + (ns_info->protect_kernel_tunables ? ELEMENTSOF(protect_kernel_tunables_table) : 0) + (ns_info->protect_kernel_modules ? ELEMENTSOF(protect_kernel_modules_table) : 0) + @@ -1339,7 +1339,9 @@ static size_t namespace_calculate_mounts( (ns_info->protect_hostname ? 2 : 0) + (namespace_info_mount_apivfs(ns_info) ? ELEMENTSOF(apivfs_table) : 0) + (creds_path ? 2 : 1) + - !!log_namespace; + !!log_namespace + + setup_propagate + /* /run/systemd/incoming */ + !!notify_socket; } static void normalize_mounts(const char *root_directory, MountEntry *mounts, size_t *n_mounts) { @@ -1491,6 +1493,7 @@ int setup_namespace( const char *verity_data_path, const char *propagate_dir, const char *incoming_dir, + const char *notify_socket, DissectImageFlags dissect_image_flags, char **error_path) { @@ -1593,7 +1596,8 @@ int setup_namespace( tmp_dir, var_tmp_dir, creds_path, log_namespace, - setup_propagate); + setup_propagate, + notify_socket); if (n_mounts > 0) { m = mounts = new0(MountEntry, n_mounts); @@ -1771,6 +1775,14 @@ int setup_namespace( .read_only = true, }; + if (notify_socket) + *(m++) = (MountEntry) { + .path_const = notify_socket, + .source_const = notify_socket, + .mode = BIND_MOUNT, + .read_only = true, + }; + assert(mounts + n_mounts == m); /* Prepend the root directory where that's necessary */ diff --git a/src/core/namespace.h b/src/core/namespace.h index 91ee44cd51..8e07dd37bc 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.h @@ -129,6 +129,7 @@ int setup_namespace( const char *root_verity, const char *propagate_dir, const char *incoming_dir, + const char *notify_socket, DissectImageFlags dissected_image_flags, char **error_path); diff --git a/src/core/service.c b/src/core/service.c index b1a4d0bf18..dbb50a9240 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1474,10 +1474,13 @@ static int service_spawn( if (!our_env) return -ENOMEM; - if (service_exec_needs_notify_socket(s, flags)) + if (service_exec_needs_notify_socket(s, flags)) { if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=%s", UNIT(s)->manager->notify_socket) < 0) return -ENOMEM; + exec_params.notify_socket = UNIT(s)->manager->notify_socket; + } + if (s->main_pid > 0) if (asprintf(our_env + n_env++, "MAINPID="PID_FMT, s->main_pid) < 0) return -ENOMEM; diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index d92bcacfad..461dde5fa9 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -174,6 +174,7 @@ static void test_protect_kernel_logs(void) { NULL, NULL, NULL, + NULL, 0, NULL); assert_se(r == 0); diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 88bdb437de..3b5836e980 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -89,6 +89,7 @@ int main(int argc, char *argv[]) { NULL, NULL, NULL, + NULL, 0, NULL); if (r < 0) { |