From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 15 Jul 2019 16:16:03 +0000 (+0200)
Subject: Apply empty_to_root() in three more spots for safety
X-Git-Tag: v243-rc1~120^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13063%2Fhead;p=thirdparty%2Fsystemd.git

Apply empty_to_root() in three more spots for safety
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index da37b52dbec..dff6543bf59 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -388,7 +388,7 @@ int cg_kill_recursive(
         while ((r = cg_read_subgroup(d, &fn)) > 0) {
                 _cleanup_free_ char *p = NULL;
 
-                p = path_join(path, fn);
+                p = path_join(empty_to_root(path), fn);
                 free(fn);
                 if (!p)
                         return -ENOMEM;
@@ -522,7 +522,7 @@ int cg_migrate_recursive(
         while ((r = cg_read_subgroup(d, &fn)) > 0) {
                 _cleanup_free_ char *p = NULL;
 
-                p = path_join(pfrom, fn);
+                p = path_join(empty_to_root(pfrom), fn);
                 free(fn);
                 if (!p)
                         return -ENOMEM;
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 0428f624813..9a1aec144e4 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -2490,7 +2490,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) {
                 while ((r = cg_read_subgroup(d, &fn)) > 0) {
                         _cleanup_free_ char *p = NULL;
 
-                        p = path_join(path, fn);
+                        p = path_join(empty_to_root(path), fn);
                         free(fn);
 
                         if (!p)