cgroup-util: check unified_cache before invoking streq()

[thirdparty/systemd.git] / src / basic / cgroup-util.c

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index f76b7f47e5cafc51cf508204035b1c5614871dfe..7ed614670da5e6bdeccb62e5975e204444b8e2f5 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2340,10 +2340,13 @@ bool cg_unified(const char *controller) {
 
         assert(cg_update_unified() >= 0);
 
-        if (streq_ptr(controller, SYSTEMD_CGROUP_CONTROLLER))
-                return unified_cache >= CGROUP_UNIFIED_SYSTEMD;
-        else
-                return unified_cache >= CGROUP_UNIFIED_ALL;
+        if (unified_cache == CGROUP_UNIFIED_NONE)
+                return false;
+
+        if (unified_cache >= CGROUP_UNIFIED_ALL)
+                return true;
+
+        return streq_ptr(controller, SYSTEMD_CGROUP_CONTROLLER);
 }
 
 bool cg_all_unified(void) {