From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Sat, 17 Sep 2016 02:26:31 +0000 (-0600)
Subject: c/r: check that cgroup_num_hierarchies > 0
X-Git-Tag: lxc-2.1.0~322^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1194%2Fhead;p=thirdparty%2Flxc.git

c/r: check that cgroup_num_hierarchies > 0

Otherwise in the error case, we end up subtracting two from the
static_args, which would lead to a segfault :)

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
---

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 0702ad2f1..3e586b9d5 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -191,7 +191,8 @@ static void exec_criu(struct criu_opts *opts)
 		return;
 	}
 
-	static_args += 2 * cgroup_num_hierarchies();
+	if (cgroup_num_hierarchies() > 0)
+		static_args += 2 * cgroup_num_hierarchies();
 
 	if (opts->user->verbose)
 		static_args++;