Merge pull request #5237 from giuseppe/check-for-valid-conmon-process

rootless: check if the conmon process is valid
containers · Feb 17, 2020 · 0bd29f8 · 0bd29f8
2 parents 640b11f + e9dc212
commit 0bd29f8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
@@ -452,6 +452,7 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
 
 	var lastErr error
 	var pausePid int
+	foundProcess := false
 
 	for _, path := range paths {
 		if !needNewNamespace {
@@ -502,12 +503,16 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
 			}
 
 			pausePid, err = strconv.Atoi(string(b[:n]))
-			if err == nil {
+			if err == nil && unix.Kill(pausePid, 0) == nil {
+				foundProcess = true
 				lastErr = nil
 				break
 			}
 		}
 	}
+	if !foundProcess {
+		return BecomeRootInUserNS(pausePidPath)
+	}
 	if lastErr != nil {
 		return false, 0, lastErr
 	}