From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 5 Jun 2019 07:27:45 +0000 (+0200)
Subject: cgroups: prevent segfault
X-Git-Tag: lxc-3.2.0~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd14a3db65bd07da96ee350bc2b575ad2737596;p=thirdparty%2Flxc.git

cgroups: prevent segfault

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 5e5995f86..9c05fbbe3 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -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;