From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 9 Oct 2018 22:02:46 +0000 (+0200)
Subject: cgfsng: fix lxc.pivot directory creation
X-Git-Tag: lxc-3.1.0~54^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23e5c04580e425a5194140da3a88c11ca54e4640;p=thirdparty%2Flxc.git

cgfsng: fix lxc.pivot directory creation

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 71dfe72e6..cc8bf8f2b 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1152,6 +1152,7 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 
 	for (int i = 0; ops->hierarchies[i]; i++) {
 		int ret;
+		char *chop;
 		struct hierarchy *h = ops->hierarchies[i];
 
 		if (!h->monitor_full_path)
@@ -1169,10 +1170,17 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 						    PIVOT_CGROUP,
 						    "cgroup.procs", NULL);
 
+		chop = strrchr(pivot_path, '/');
+		if (chop)
+			*chop = '\0';
+
 		ret = mkdir_p(pivot_path, 0755);
 		if (ret < 0 && errno != EEXIST)
 			goto next;
 
+		if (chop)
+			*chop = '/';
+
 		/* Move ourselves into the pivot cgroup to delete our own
 		 * cgroup.
 		 */