From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 8 Jun 2015 15:33:22 +0000 (-0500)
Subject: coverity: fix use-after-free in cgmanager.
X-Git-Tag: lxc-2.0.0.beta1~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17d252a82225d17d655c20919060cb3ea2974af7;p=thirdparty%2Flxc.git

coverity: fix use-after-free in cgmanager.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index 6df530ca5..c143beab9 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -1258,8 +1258,10 @@ static bool collect_subsytems(void)
 		}
 	}
 	fclose(f);
+	f = NULL;
 
 	free(line);
+	line = NULL;
 
 collected:
 	if (!nr_subsystems) {
@@ -1272,8 +1274,10 @@ collected:
 	if (!cgroup_use && errno != 0)
 		goto out_good;
 	if (cgroup_use) {
-		if (!verify_and_prune(cgroup_use))
-			goto out_free;
+		if (!verify_and_prune(cgroup_use)) {
+			free_subsystems();
+			return false;
+		}
 		subsystems_inone[0] = NIH_MUST( strdup(cgroup_use) );
 		cgm_all_controllers_same = false;
 	}