Fix deadlock between 'podman ps' and 'container inspect' commands

Fixes: #16326 [NO NEW TESTS NEEDED] Signed-off-by: Mikhail Khachayants <[email protected]>
containers · Oct 28, 2022 · f355900 · f355900
1 parent 84d04a2
commit f355900
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
@@ -581,20 +581,15 @@ func (p *Pod) Status() (map[string]define.ContainerStatus, error) {
 }
 
 func containerStatusFromContainers(allCtrs []*Container) (map[string]define.ContainerStatus, error) {
-	// We need to lock all the containers
-	for _, ctr := range allCtrs {
-		ctr.lock.Lock()
-		defer ctr.lock.Unlock()
-	}
-
-	// Now that all containers are locked, get their status
 	status := make(map[string]define.ContainerStatus, len(allCtrs))
 	for _, ctr := range allCtrs {
-		if err := ctr.syncContainer(); err != nil {
+		state, err := ctr.State()
+
+		if err != nil {
 			return nil, err
 		}
 
-		status[ctr.ID()] = ctr.state.State
+		status[ctr.ID()] = state
 	}
 
 	return status, nil