coverity: fix use-after-free in cgmanager.

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

coverity: fix use-after-free in cgmanager.
b76e8462 · Serge Hallyn · Stéphane Graber · 21a7c27f · b76e8462
Commit b76e8462 authored Jun 08, 2015 by Serge Hallyn Committed by Stéphane Graber Aug 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

cgmanager.c src/lxc/cgmanager.c +6 -2

No files found.
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -1243,8 +1243,10 @@ static bool collect_subsytems(void)
 		}
 	}
 	fclose(f);
+	f = NULL;

 	free(line);
+	line = NULL;

 collected:
 	if (!nr_subsystems) {
@@ -1257,8 +1259,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;
 	}