From 064e901cb34b1a3dddbbe98595a2731bb85c4424 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Wed, 29 May 2024 11:46:51 +0200

Subject: [PATCH 2/3] exec-util: use the stdio array of safe_fork_full() where

 appropriate

---

 src/shared/exec-util.c | 28 ++++++++++++++++++----------

 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c

index 1c7b14d98d..dc0974572f 100644

--- a/src/shared/exec-util.c

+++ b/src/shared/exec-util.c

@@ -36,27 +36,35 @@

 /* Put this test here for a lack of better place */

 assert_cc(EAGAIN == EWOULDBLOCK);

-static int do_spawn(const char *path, char *argv[], int stdout_fd, pid_t *pid, bool set_systemd_exec_pid) {

-        pid_t _pid;

+static int do_spawn(

+                const char *path,

+                char *argv[],

+                int stdout_fd,

+                pid_t *ret_pid,

+                bool set_systemd_exec_pid) {

+

         int r;

+        assert(path);

+        assert(ret_pid);

+

         if (null_or_empty_path(path) > 0) {

                 log_debug("%s is empty (a mask).", path);

                 return 0;

         }

-        r = safe_fork("(direxec)", FORK_DEATHSIG_SIGTERM|FORK_LOG|FORK_RLIMIT_NOFILE_SAFE, &_pid);

+        pid_t pid;

+        r = safe_fork_full(

+                        "(direxec)",

+                        (const int[]) { STDIN_FILENO, stdout_fd < 0 ? STDOUT_FILENO : stdout_fd, STDERR_FILENO },

+                        /* except_fds= */ NULL, /* n_except_fds= */ 0,

+                        FORK_DEATHSIG_SIGTERM|FORK_LOG|FORK_RLIMIT_NOFILE_SAFE|FORK_REARRANGE_STDIO,

+                        &pid;;

         if (r < 0)

                 return r;

         if (r == 0) {

                 char *_argv[2];

-                if (stdout_fd >= 0) {

-                        r = rearrange_stdio(STDIN_FILENO, TAKE_FD(stdout_fd), STDERR_FILENO);

-                        if (r < 0)

-                                _exit(EXIT_FAILURE);

-                }

-

                 if (set_systemd_exec_pid) {

                         r = setenv_systemd_exec_pid(false);

                         if (r < 0)

@@ -75,7 +83,7 @@ static int do_spawn(const char *path, char *argv[], int stdout_fd, pid_t *pid, b

                 _exit(EXIT_FAILURE);

         }

-        *pid = _pid;

+        *ret_pid = pid;

         return 1;

 }

-- 

2.45.0