Merge pull request #12464 from giuseppe/fix-race-reading-cgroup-file

container, cgroup: detect pid termination
containers · Dec 1, 2021 · ecc6630 · ecc6630
2 parents 078e633 + 0afaf78
commit ecc6630
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/libpod/container.go b/libpod/container.go
@@ -939,6 +939,11 @@ func (c *Container) cGroupPath() (string, error) {
 	procPath := fmt.Sprintf("/proc/%d/cgroup", c.state.PID)
 	lines, err := ioutil.ReadFile(procPath)
 	if err != nil {
+		// If the file doesn't exist, it means the container could have been terminated
+		// so report it.
+		if os.IsNotExist(err) {
+			return "", errors.Wrapf(define.ErrCtrStopped, "cannot get cgroup path unless container %s is running", c.ID())
+		}
 		return "", err
 	}