]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cgroups: prevent segfault 3029/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Wed, 5 Jun 2019 07:27:45 +0000 (09:27 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Wed, 5 Jun 2019 07:31:17 +0000 (09:31 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index 5e5995f86cd92716f3450963f2cab0a9c31c8330..9c05fbbe3d8f1051ef5e1008f6d3939887ad73fc 100644 (file)
@@ -453,8 +453,10 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
                TRACE("The path \""__OFFLINE_CPUS"\" to read offline cpus from does not exist");
        }
 
-       if ((maxisol == 0) && (maxoffline == 0))
+       if ((maxisol == 0) && (maxoffline == 0)) {
+               cpulist = move_ptr(posscpus);
                goto copy_parent;
+       }
 
        possmask = lxc_cpumask(posscpus, maxposs);
        if (!possmask) {
@@ -506,8 +508,6 @@ copy_parent:
                fpath = must_make_path(path, "cpuset.cpus", NULL);
                ret = lxc_write_to_file(fpath, cpulist, strlen(cpulist), false,
                                        0666);
-               if (cpulist == posscpus)
-                       cpulist = NULL;
                if (ret < 0) {
                        SYSERROR("Failed to write cpu list to \"%s\"", fpath);
                        return false;