From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 11 Dec 2018 10:35:12 +0000 (+0100)
Subject: storage: src cannot be truncated
X-Git-Tag: lxc-2.0.10~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c458e2120b83163a3e77707dafeed0352bdaa5d0;p=thirdparty%2Flxc.git

storage: src cannot be truncated

s/strlcpy/strncpy/g

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

diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c
index 4cd37e2d5..b62c6c843 100644
--- a/src/lxc/storage/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -89,14 +89,8 @@ char *dir_new_path(char *src, const char *oldname, const char *name,
 	}
 
 	while ((p2 = strstr(src, oldname)) != NULL) {
-		size_t retlen;
-
 		/* copy text up to oldname */
-		retlen = strlcpy(p, src, p2 - src);
-		if (retlen >= p2 - src) {
-			free(ret);
-			return NULL;
-		}
+		strncpy(p, src, p2 - src);
 
 		/* move target pointer (p) */
 		p += p2 - src;