start: handle kernel header and kernel incompatability

We might e.g. be compiled in a container with old kernel headers. In this
scenario CLONE_PIDFD will work but pidfd_send_signal() might not be detected
because __NR_pidfd_send_signal is not defined because the kernel headers don't
match the kernel version.

This explains and fixes test-suite hangs on Jenkins I've recently debugged.

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index c5603c569943fee6fe6c5b966ee7ced60e662c7b..2241503861494a9994047e6dc6fc9578025a60f2 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1076,11 +1076,13 @@ void lxc_abort(const char *name, struct lxc_handler *handler)
 
        lxc_set_state(name, handler, ABORTING);
 
-       if (handler->pidfd >= 0)
+       if (handler->pidfd >= 0) {
                ret = lxc_raw_pidfd_send_signal(handler->pidfd, SIGKILL, NULL, 0);
-       else if (handler->pid > 0)
-               ret = kill(handler->pid, SIGKILL);
-       if (ret < 0)
+               if (ret)
+                       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);
 
        do {