From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Jan 2025 22:29:32 +0000 (+0100)
Subject: machine: switch to using cleanup handling for child process cleanup
X-Git-Tag: v258-rc1~1688^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=237aca5fbeebde64bf28725b6ccaf31bf2518a2b;p=thirdparty%2Fsystemd.git

machine: switch to using cleanup handling for child process cleanup
---

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 7abf5437c47..752ba667908 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -991,8 +991,8 @@ int machine_copy_from_to(
         _cleanup_close_ int host_fd = -EBADF, target_mntns_fd = -EBADF, source_mntns_fd = -EBADF;
         _cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
         _cleanup_free_ char *host_basename = NULL, *container_basename = NULL;
+        _cleanup_(sigkill_waitp) pid_t child = 0;
         uid_t uid_shift;
-        pid_t child;
         int r;
 
         assert(manager);
@@ -1094,12 +1094,12 @@ int machine_copy_from_to(
 
         Operation *operation;
         r = operation_new(manager, machine, child, errno_pipe_fd[0], &operation);
-        if (r < 0) {
-                sigkill_wait(child);
+        if (r < 0)
                 return r;
-        }
 
         TAKE_FD(errno_pipe_fd[0]);
+        TAKE_PID(child);
+
         *ret = operation;
         return 0;
 }