From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 2 Dec 2024 10:25:53 +0000 (+0100)
Subject: basic/namespace-util: fix double logging after fork failure
X-Git-Tag: v257~46^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22996a3393e10c3dce3137daf9fd6c5483d9a3b8;p=thirdparty%2Fsystemd.git

basic/namespace-util: fix double logging after fork failure

[   10.056930] (journald)[104]: Failed to fork off '(sd-mkuserns)': Invalid argument
[   10.063727] systemd[1]: systemd-modules-load.service: About to execute: /usr/lib/systemd/systemd-modules-load
[   10.071148] (journald)[104]: Failed to fork process (sd-mkuserns): Invalid argument

safe_fork_full() already logs at debug level, so the caller shouldn't.
---

diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
index 5bc7ff6ab5f..332e8cdfd5d 100644
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
@@ -348,7 +348,7 @@ int userns_acquire(const char *uid_map, const char *gid_map) {
 
         r = safe_fork("(sd-mkuserns)", FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGKILL|FORK_NEW_USERNS, &pid);
         if (r < 0)
-                return log_debug_errno(r, "Failed to fork process (sd-mkuserns): %m");
+                return r;
         if (r == 0)
                 /* Child. We do nothing here, just freeze until somebody kills us. */
                 freeze();