]> git.proxmox.com Git - mirror_lxc.git/commitdiff
cgfsng: check whether we have a conf
authorChristian Brauner <christian.brauner@ubuntu.com>
Wed, 27 Sep 2017 16:24:42 +0000 (18:24 +0200)
committerStéphane Graber <stgraber@ubuntu.com>
Wed, 4 Oct 2017 22:55:23 +0000 (18:55 -0400)
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>
src/lxc/cgroups/cgfsng.c

index ed391a616ac046aeca2ca6474164d99b98179b58..897336f07fdff28d2f6ec5d50125f0cdc80a10cc 100644 (file)
@@ -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);
-       d->cgroup_meta.controllers = must_copy_string(handler->conf->cgroup_meta.controllers);
+       if (handler->conf) {
+               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");