cgfsng: check whether we have a conf

We can't rely in general on the presence of an initialized conf on cgroup init time. One good example are our criu codepaths. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgfsng: check whether we have a conf
9bd02221 · Christian Brauner · Stéphane Graber · 76208052 · 9bd02221
Unverified Commit 9bd02221 authored Sep 27, 2017 by Christian Brauner Committed by Stéphane Graber Oct 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +4 -2

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1175,8 +1175,10 @@ static void *cgfsng_init(struct lxc_handler *handler)
 	d->name = must_copy_string(handler->name);
 	/* copy per-container cgroup information */
-	d->cgroup_meta.dir = must_copy_string(handler->conf->cgroup_meta.dir);
+	if (handler->conf) {
-	d->cgroup_meta.controllers = must_copy_string(handler->conf->cgroup_meta.controllers);
+		d->cgroup_meta.dir = must_copy_string(handler->conf->cgroup_meta.dir);
+		d->cgroup_meta.controllers = must_copy_string(handler->conf->cgroup_meta.controllers);
+	}
 	/* copy system-wide cgroup information */
 	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");