From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Oct 2021 15:06:05 +0000 (+0200)
Subject: cgroups-show: use path_join() when concatenating cgroup paths
X-Git-Tag: v250-rc1~555^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa13d3841728ff5212725c245616bfbf20cbeb0a;p=thirdparty%2Fsystemd.git

cgroups-show: use path_join() when concatenating cgroup paths
---

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 4c0bb49108b..060c19c57c3 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -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();