morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

various: assorted cleanups for safe_fork (#39661)

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-10 18:40:16 +09:00
committed by GitHub
parent f50f785737 1be6068c48
commit 39adbedafc
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/process-util.c
View File

@@ -1662,7 +1662,7 @@ int pidref_safe_fork_full(
}
if (ret_pid) {
if (FLAGS_SET(flags, FORK_PID_ONLY))
if (FLAGS_SET(flags, _FORK_PID_ONLY))
*ret_pid = PIDREF_MAKE_FROM_PID(pid);
else {
r = pidref_set_pid(ret_pid, pid);
@@ -1840,7 +1840,7 @@ int pidref_safe_fork_full(
freeze();
if (ret_pid) {
if (FLAGS_SET(flags, FORK_PID_ONLY))
if (FLAGS_SET(flags, _FORK_PID_ONLY))
*ret_pid = PIDREF_MAKE_FROM_PID(getpid_cached());
else {
r = pidref_set_self(ret_pid);
@@ -1869,7 +1869,7 @@ int safe_fork_full(
* a pidref to the caller. */
assert(!FLAGS_SET(flags, FORK_DETACH) || !ret_pid);
r = pidref_safe_fork_full(name, stdio_fds, except_fds, n_except_fds, flags|FORK_PID_ONLY, ret_pid ? &pidref : NULL);
r = pidref_safe_fork_full(name, stdio_fds, except_fds, n_except_fds, flags|_FORK_PID_ONLY, ret_pid ? &pidref : NULL);
if (r < 0 || !ret_pid)
return r;

3
src/basic/process-util.h
View File

@@ -187,7 +187,8 @@ typedef enum ForkFlags {
FORK_NEW_NETNS = 1 << 20, /* Run child in its own network namespace 💣 DO NOT USE IN THREADED PROGRAMS! 💣 */
FORK_NEW_PIDNS = 1 << 21, /* Run child in its own PID namespace 💣 DO NOT USE IN THREADED PROGRAMS! 💣 */
FORK_FREEZE = 1 << 22, /* Don't return in child, just call freeze() instead */
FORK_PID_ONLY = 1 << 23, /* Don't open a pidfd referencing the child process */
_FORK_PID_ONLY = 1 << 23, /* Don't open a pidfd referencing the child process */
} ForkFlags;
int pidref_safe_fork_full(

2
src/notify/notify.c
View File

@@ -520,7 +520,7 @@ static int action_fork(char *const *_command) {
/* stdio_fds= */ (const int[]) { -EBADF, -EBADF, STDERR_FILENO },
/* except_fds= */ NULL,
/* n_except_fds= */ 0,
/* flags= */ FORK_REARRANGE_STDIO,
/* flags= */ FORK_REARRANGE_STDIO|FORK_LOG,
&child);
if (r < 0)
return log_error_errno(r, "Failed to fork child in order to execute '%s': %m", c);

2
src/shared/hostname-setup.c
View File

@@ -377,7 +377,7 @@ int pidref_gethostname_full(PidRef *pidref, GetHostnameFlags flags, char **ret)
return -errno;
_cleanup_(pidref_done_sigkill_wait) PidRef child = PIDREF_NULL;
r = pidref_safe_fork("(gethostname)", FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGKILL, &child);
r = pidref_safe_fork("(sd-gethostname)", FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGKILL, &child);
if (r < 0)
return r;
if (r == 0) {