From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 4 Dec 2017 00:38:01 +0000 (+0100)
Subject: confile_legacy: prevent null pointer deref
X-Git-Tag: lxc-3.0.0.beta1~132^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39bcb70cf588386d96a93061a0b5ed9a6c39b2c;p=thirdparty%2Flxc.git

confile_legacy: prevent null pointer deref

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

diff --git a/src/lxc/confile_legacy.c b/src/lxc/confile_legacy.c
index eb956dd40..9fc2c06c9 100644
--- a/src/lxc/confile_legacy.c
+++ b/src/lxc/confile_legacy.c
@@ -969,7 +969,7 @@ static int lxc_clear_nic(struct lxc_conf *c, const char *key)
 
 	p1 = strchr(key, '.');
 	if (!p1 || *(p1+1) == '\0')
-		p1 = NULL;
+		return -1;
 
 	if (!p1 && it) {
 		lxc_remove_nic(it);
@@ -987,8 +987,9 @@ static int lxc_clear_nic(struct lxc_conf *c, const char *key)
 			free(it2->elem);
 			free(it2);
 		}
+	} else {
+		return -1;
 	}
-	else return -1;
 
 	return 0;
 }