start: fix container killing logic

We need to account for the case where pidfd's are not supported by the kernel
in question.

Closes: #3254
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 2241503861494a9994047e6dc6fc9578025a60f2..917788e4ad0e5d384bdaffd3b0f08d4e7526a224 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1079,11 +1079,13 @@ void lxc_abort(const char *name, struct lxc_handler *handler)
        if (handler->pidfd >= 0) {
                ret = lxc_raw_pidfd_send_signal(handler->pidfd, SIGKILL, NULL, 0);
                if (ret)
-                       SYSWARN("Failed to send SIGKILL via pidfd %d for process %d", handler->pidfd, handler->pid);
+                       SYSWARN("Failed to send SIGKILL via pidfd %d for process %d",
+                               handler->pidfd, handler->pid);
        }
 
-       if (ret && (errno != ESRCH) && kill(handler->pid, SIGKILL))
-               SYSERROR("Failed to send SIGKILL to %d", handler->pid);
+       if (!ret || errno != ESRCH)
+               if (kill(handler->pid, SIGKILL))
+                       SYSWARN("Failed to send SIGKILL to %d", handler->pid);
 
        do {
                ret = waitpid(-1, &status, 0);