From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 24 Feb 2018 14:30:56 +0000 (+0100)
Subject: lxccontainer: create_container_dir()
X-Git-Tag: lxc-2.0.10~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6aa5dc680557b57e0827a62b014eacccd5cd122;p=thirdparty%2Flxc.git

lxccontainer: create_container_dir()

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index ac438fa35..d1f23c420 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1157,25 +1157,27 @@ static int do_create_container_dir(const char *path, struct lxc_conf *conf)
 	return ret;
 }
 
-/*
- * create the standard expected container dir
- */
+/* Create the standard expected container dir. */
 static bool create_container_dir(struct lxc_container *c)
 {
+	int ret;
+	size_t len;
 	char *s;
-	int len, ret;
 
 	len = strlen(c->config_path) + strlen(c->name) + 2;
 	s = malloc(len);
 	if (!s)
 		return false;
+
 	ret = snprintf(s, len, "%s/%s", c->config_path, c->name);
-	if (ret < 0 || ret >= len) {
+	if (ret < 0 || (size_t)ret >= len) {
 		free(s);
 		return false;
 	}
+
 	ret = do_create_container_dir(s, c->lxc_conf);
 	free(s);
+
 	return ret == 0;
 }