Don't support cgroupns on cgroups v1

Fixes #4108 Signed-off-by: Mark Yen <mark.yen@suse.com> (cherry picked from commit d48bf06) Signed-off-by: Justin Chadwell <me@jedevc.com>
moby · Oct 13, 2023 · 5f72472 · 5f72472
1 parent 1f9ad6c
commit 5f72472
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/executor/oci/spec_unix.go b/executor/oci/spec_unix.go
@@ -149,9 +149,13 @@ func getTracingSocket() string {
 
 func cgroupNamespaceSupported() bool {
 	cgroupNSOnce.Do(func() {
-		if _, err := os.Stat("/proc/self/ns/cgroup"); !os.IsNotExist(err) {
-			supportsCgroupNS = true
+		if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
+			return
 		}
+		if _, err := os.Stat("/sys/fs/cgroup/cgroup.subtree_control"); os.IsNotExist(err) {
+			return
+		}
+		supportsCgroupNS = true
 	})
 	return supportsCgroupNS
 }