oci: check for valid PID before kill(pid, 0)

check that the container has a valid pid before attempting to use kill($PID, 0) on it. If the PID==0, it means the container is already stopped. Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Jan 9, 2023 · 494db3e · 494db3e
1 parent 1da081f
commit 494db3e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go
@@ -429,6 +429,10 @@ func (r *ConmonOCIRuntime) StopContainer(ctr *Container, timeout uint, all bool)
 	}
 
 	if err := r.KillContainer(ctr, uint(unix.SIGKILL), all); err != nil {
+		// If the PID is 0, then the container is already stopped.
+		if ctr.state.PID == 0 {
+			return nil
+		}
 		// Again, check if the container is gone. If it is, exit cleanly.
 		if aliveErr := unix.Kill(ctr.state.PID, 0); errors.Is(aliveErr, unix.ESRCH) {
 			return nil