From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 3 Jun 2015 17:20:19 +0000 (+0000)
Subject: don't dereference a NULL c->lxc_conf
X-Git-Tag: lxc-2.0.0.beta1~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a70a69e8a042d31e96258488f6d7228b8eac8d6b;p=thirdparty%2Flxc.git

don't dereference a NULL c->lxc_conf

Commit 37cf711b added a destroy hook, but when it checks
at destroy time whether that hook exists, it assumes that
c->lxc_conf is good.  In fact lxc_conf can be NULL, so check
for that.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 916c99c91..445cc226b 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2160,11 +2160,12 @@ static bool container_destroy(struct lxc_container *c)
 {
 	bool bret = false;
 	int ret;
-	struct lxc_conf *conf = c->lxc_conf;
+	struct lxc_conf *conf;
 
 	if (!c || !do_lxcapi_is_defined(c))
 		return false;
 
+	conf = c->lxc_conf;
 	if (container_disk_lock(c))
 		return false;
 
@@ -2174,7 +2175,7 @@ static bool container_destroy(struct lxc_container *c)
 		goto out;
 	}
 
-	if (!lxc_list_empty(&conf->hooks[LXCHOOK_DESTROY])) {
+	if (conf && !lxc_list_empty(&conf->hooks[LXCHOOK_DESTROY])) {
 		/* Start of environment variable setup for hooks */
 		if (setenv("LXC_NAME", c->name, 1)) {
 			SYSERROR("failed to set environment variable for container name");