From a9abef7f67c18d8aa88eeb429d2c3b053c8d2af2 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 21 Nov 2022 10:51:15 +0100 Subject: [PATCH] mkfs-util: Use FORK_CLOSE_ALL_FDS --- src/shared/mkfs-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index b06ba32089..5a56c5e473 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -168,7 +168,7 @@ static int do_mcopy(const char *node, const char *root) { if (fstat(dirfd(rootdir), &st) < 0) return log_error_errno(errno, "Failed to stat '%s': %m", root); - r = safe_fork("(mcopy)", FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_WAIT|FORK_STDOUT_TO_STDERR|FORK_NEW_USERNS, NULL); + r = safe_fork("(mcopy)", FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_WAIT|FORK_STDOUT_TO_STDERR|FORK_NEW_USERNS|FORK_CLOSE_ALL_FDS, NULL); if (r < 0) return r; if (r == 0) { @@ -492,7 +492,7 @@ int make_filesystem( if (root && stat(root, &st) < 0) return log_error_errno(errno, "Failed to stat %s: %m", root); - r = safe_fork("(mkfs)", FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_WAIT|FORK_STDOUT_TO_STDERR|(root ? FORK_NEW_USERNS : 0), NULL); + r = safe_fork("(mkfs)", FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_WAIT|FORK_STDOUT_TO_STDERR|FORK_CLOSE_ALL_FDS|(root ? FORK_NEW_USERNS : 0), NULL); if (r < 0) return r; if (r == 0) {