From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 31 Oct 2017 16:06:58 +0000 (+0100)
Subject: cgroups/cgfsng: fix get_controllers() for cgroup2
X-Git-Tag: lxc-3.0.0.beta1~196^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2deb1d83d44346c8f52b2b7ea447b6abeec5c38;p=thirdparty%2Flxc.git

cgroups/cgfsng: fix get_controllers() for cgroup2

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 4818fc15f..cd0b5c720 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -786,7 +786,7 @@ static char **get_controllers(char **klist, char **nlist, char *line)
 	/* cgroup v2 does not have separate mountpoints for controllers */
 	if (is_cgroup_v2) {
 		must_append_controller(klist, nlist, &aret, "cgroup2");
-		return NULL;
+		return aret;
 	}
 
 	/* strdup() here for v1 hierarchies. Otherwise strtok_r() will destroy