]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cgroups-show: use path_join() when concatenating cgroup paths
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Oct 2021 15:06:05 +0000 (17:06 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 7 Oct 2021 09:50:02 +0000 (11:50 +0200)
src/shared/cgroup-show.c

index 4c0bb49108b2c9a7b0165818140d5e463fcc5b84..060c19c57c3f7ec87c9fd4d8f52972cae8f482e2 100644 (file)
@@ -384,14 +384,14 @@ int show_cgroup_get_path_and_warn(
                 if (r == -ENOMEDIUM)
                         return log_error_errno(r, "Failed to get root control group path.\n"
                                                   "No cgroup filesystem mounted on /sys/fs/cgroup");
-                else if (r < 0)
+                if (r < 0)
                         return log_error_errno(r, "Failed to get root control group path: %m");
         }
 
         if (prefix) {
                 char *t;
 
-                t = strjoin(root, prefix);
+                t = path_join(root, prefix);
                 if (!t)
                         return log_oom();