diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-07 18:55:39 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-21 07:39:18 +0900 |
| commit | 0c2aedb451c9da0d997e46c84d399c80d7fcb61d (patch) | |
| tree | 594f8797a9bf7786406c3c0af349a8c6dca4f333 /src/udev/udev-event.c | |
| parent | 911f8f0183ef723737de3661b1dd042c7b2fcb6e (diff) | |
| download | systemd-0c2aedb451c9da0d997e46c84d399c80d7fcb61d.tar.gz | |
tree-wide: use FORK_REARRANGE_STDIO and FORK_CLOSE_ALL_FDS
Diffstat (limited to 'src/udev/udev-event.c')
| -rw-r--r-- | src/udev/udev-event.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index ec4ad30824..a8d7db40b4 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -810,18 +810,16 @@ int udev_event_spawn( log_device_debug(event->dev, "Starting '%s'", cmd); - r = safe_fork("(spawn)", FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_LOG|FORK_RLIMIT_NOFILE_SAFE, &pid); + r = safe_fork_full("(spawn)", + (int[]) { -EBADF, outpipe[WRITE_END], errpipe[WRITE_END] }, + NULL, 0, + FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG|FORK_REARRANGE_STDIO|FORK_LOG|FORK_RLIMIT_NOFILE_SAFE, + &pid); if (r < 0) return log_device_error_errno(event->dev, r, "Failed to fork() to execute command '%s': %m", cmd); if (r == 0) { - if (rearrange_stdio(-EBADF, TAKE_FD(outpipe[WRITE_END]), TAKE_FD(errpipe[WRITE_END])) < 0) - _exit(EXIT_FAILURE); - - (void) close_all_fds(NULL, 0); - DEVICE_TRACE_POINT(spawn_exec, event->dev, cmd); - execve(argv[0], argv, envp); _exit(EXIT_FAILURE); } |