libcontainer: set pids limit to max when set to 0

Signed-off-by: Peter Hunt <pehunt@redhat.com>
opencontainers · Sep 12, 2023 · 670474e · 670474e
1 parent cb44958
commit 670474e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/libcontainer/cgroups/fs/pids.go b/libcontainer/cgroups/fs/pids.go
@@ -20,20 +20,14 @@ func (s *PidsGroup) Apply(path string, _ *configs.Resources, pid int) error {
 }
 
 func (s *PidsGroup) Set(path string, r *configs.Resources) error {
-	if r.PidsLimit != 0 {
-		// "max" is the fallback value.
-		limit := "max"
+	// "max" is the fallback value.
+	limit := "max"
 
-		if r.PidsLimit > 0 {
-			limit = strconv.FormatInt(r.PidsLimit, 10)
-		}
-
-		if err := cgroups.WriteFile(path, "pids.max", limit); err != nil {
-			return err
-		}
+	if r.PidsLimit > 0 {
+		limit = strconv.FormatInt(r.PidsLimit, 10)
 	}
 
-	return nil
+	return cgroups.WriteFile(path, "pids.max", limit)
 }
 
 func (s *PidsGroup) GetStats(path string, stats *cgroups.Stats) error {

diff --git a/libcontainer/cgroups/fs2/pids.go b/libcontainer/cgroups/fs2/pids.go
@@ -18,9 +18,6 @@ func isPidsSet(r *configs.Resources) bool {
 }
 
 func setPids(dirPath string, r *configs.Resources) error {
-	if !isPidsSet(r) {
-		return nil
-	}
 	if val := numToStr(r.PidsLimit); val != "" {
 		if err := cgroups.WriteFile(dirPath, "pids.max", val); err != nil {
 			return err