cgroup: always enable controller

even if the fast path was taken and the cgroup was already joined, we still need to make sure all the controllers are enabled. Closes: #1083 Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Nov 29, 2022 · 3880f04 · 3880f04
1 parent 258c237
commit 3880f04
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/libcrun/cgroup-cgroupfs.c b/src/libcrun/cgroup-cgroupfs.c
@@ -93,10 +93,6 @@ libcrun_cgroup_enter_cgroupfs (struct libcrun_cgroup_args *args, struct libcrun_
   pid_t pid = args->pid;
   int cgroup_mode;
 
-  /* The cgroup was already joined, nothing more left to do.  */
-  if (args->joined)
-    return 0;
-
   cgroup_mode = libcrun_get_cgroup_mode (err);
   if (UNLIKELY (cgroup_mode < 0))
     return cgroup_mode;
@@ -112,6 +108,10 @@ libcrun_cgroup_enter_cgroupfs (struct libcrun_cgroup_args *args, struct libcrun_
         return ret;
     }
 
+  /* The cgroup was already joined, nothing more left to do.  */
+  if (args->joined)
+    return 0;
+
   return enter_cgroup (cgroup_mode, pid, 0, out->path, true, err);
 }