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>

start: fix container killing logic
183bda09 · Christian Brauner · 3de45bf6 · 183bda09
Unverified Commit 183bda09 authored Jan 16, 2020 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

start.c src/lxc/start.c +5 -3

No files found.
--- 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);