shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-26 08:55:40 +03:00
Code

core: Setup ExecDirectories before stdin/stdout.

Browse Source 
Fixes #27591
This commit is contained in:
Andrew Potter 2024-10-24 13:14:57 -07:00
parent 4e69da071d
commit a2872389e3
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/exec-invoke.c
View File

@ -4382,6 +4382,15 @@ int exec_invoke(
}
}
/* Setup ExecDirectories now, as they may be targeted by stdin/stdout */
needs_mount_namespace = exec_needs_mount_namespace(context, params, runtime);
for (ExecDirectoryType dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++) {
r = setup_exec_directory(context, params, uid, gid, dt, needs_mount_namespace, exit_status);
if (r < 0)
return log_exec_error_errno(context, params, r, "Failed to set up special execution directory in %s: %m", params->prefix[dt]);
}
r = setup_input(context, params, socket_fd, named_iofds);
if (r < 0) {
*exit_status = EXIT_STDIN;
@ -4602,14 +4611,6 @@ int exec_invoke(
}
}
needs_mount_namespace = exec_needs_mount_namespace(context, params, runtime);
for (ExecDirectoryType dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++) {
r = setup_exec_directory(context, params, uid, gid, dt, needs_mount_namespace, exit_status);
if (r < 0)
return log_exec_error_errno(context, params, r, "Failed to set up special execution directory in %s: %m", params->prefix[dt]);
}
r = exec_setup_credentials(context, params, params->unit_id, uid, gid);
if (r < 0) {
*exit_status = EXIT_CREDENTIALS;

6
src/test/test-execute.c
View File

@ -1128,6 +1128,11 @@ static void test_exec_runtimedirectory(Manager *m) {
test(m, "exec-runtimedirectory-owner-" NOBODY_GROUP_NAME ".service", MANAGER_IS_SYSTEM(m) ? 0 : EXIT_GROUP, CLD_EXITED);
}
static void test_exec_runtimedirectory_stdoutput(Manager *m) {
(void) rm_rf("/run/test-exec_runtimedirectory_standardoutput", REMOVE_ROOT|REMOVE_PHYSICAL);
test(m, "exec-runtimedirectory-stdoutput.service", 0, CLD_EXITED);
}
static void test_exec_capabilityboundingset(Manager *m) {
int r;
@ -1359,6 +1364,7 @@ static void run_tests(RuntimeScope scope, char **patterns) {
entry(test_exec_readwritepaths),
entry(test_exec_restrictnamespaces),
entry(test_exec_runtimedirectory),
entry(test_exec_runtimedirectory_stdoutput),
entry(test_exec_specifier),
entry(test_exec_standardinput),
entry(test_exec_standardoutput),

9
test/test-execute/exec-runtimedirectory-stdoutput.service Normal file
View File

@ -0,0 +1,9 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=Test for RuntimeDirectory used by StandardOutput
[Service]
ExecStart=sh -c 'printf "hello\nhello\n"'
Type=oneshot
RuntimeDirectory=test-exec_runtimedirectory_standardoutput
StandardOutput=file:/run/test-exec_runtimedirectory_standardoutput/test-exec-runtimedirectory_standardoutput-output