When attempting to kill a dead processes, do not return failure

A race exists where a container engine tells crun to kill a container, process, where the process already died. In this case do not return an error. Fixes: containers/podman#18452 Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Aug 25, 2023 · b219fa6 · b219fa6
1 parent 6369207
commit b219fa6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libocispec b/libocispec
diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -5364,6 +5364,10 @@ libcrun_kill_linux (libcrun_container_status_t *status, int signal, libcrun_erro
       if (errno == ENOSYS)
         return libcrun_kill_linux_no_pidfd (status, true, signal, err);
 
+      /* when pidfd_open fails with ESRCH the process is already dead */
+      if (errno == ESRCH)
+	      return 0
+
       return crun_make_error (err, errno, "open pidfd");
     }
+0 −6		Makefile.am
+15 −0		diff
+1 −1		image-spec
+1 −1		runtime-spec
+3 −6		src/image/mod.rs
+2 −7		src/ocispec/headers.py
+0 −9		src/ocispec/json_common.h
+3 −45		src/runtime/mod.rs