process-util: make safe_fork() unset $NOTIFY_SOCKET
Propagating $NOTIFY_SOCKET is typically dangerous. Let's unset it unless explicitly requested to keep it. Fixes #27288. Replaces #27291.
This commit is contained in:
@@ -1365,6 +1365,14 @@ int safe_fork_full(
|
||||
}
|
||||
}
|
||||
|
||||
if (!FLAGS_SET(flags, FORK_KEEP_NOTIFY_SOCKET)) {
|
||||
r = RET_NERRNO(unsetenv("NOTIFY_SOCKET"));
|
||||
if (r < 0) {
|
||||
log_full_errno(prio, r, "Failed to unset $NOTIFY_SOCKET: %m");
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (ret_pid)
|
||||
*ret_pid = getpid_cached();
|
||||
|
||||
|
||||
@@ -156,6 +156,7 @@ typedef enum ForkFlags {
|
||||
FORK_FLUSH_STDIO = 1 << 13, /* fflush() stdout (and stderr) before forking */
|
||||
FORK_NEW_USERNS = 1 << 14, /* Run child in its own user namespace */
|
||||
FORK_CLOEXEC_OFF = 1 << 15, /* In the child: turn off O_CLOEXEC on all fds in except_fds[] */
|
||||
FORK_KEEP_NOTIFY_SOCKET = 1 << 16, /* Unless this specified, $NOTIFY_SOCKET will be unset. */
|
||||
} ForkFlags;
|
||||
|
||||
int safe_fork_full(
|
||||
|
||||
Reference in New Issue
Block a user