From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 11 Feb 2021 09:28:07 +0000 (+0100)
Subject: confile_utils: convert to strnprintf()
X-Git-Tag: lxc-5.0.0~292^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34a51534fd280a1ff78aaf2c822b2e985aaad60d;p=thirdparty%2Flxc.git

confile_utils: convert to strnprintf()

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

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index b316de5f9..f75d6ae00 100644
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -768,18 +768,17 @@ bool new_hwaddr(char *hwaddr)
 
 	seed = randseed(false);
 
-	ret = snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand_r(&seed) % 255,
+	ret = strnprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand_r(&seed) % 255,
 		       rand_r(&seed) % 255, rand_r(&seed) % 255);
 #else
 
 	(void)randseed(true);
 
-	ret = snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand() % 255,
+	ret = strnprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand() % 255,
 		       rand() % 255, rand() % 255);
 #endif
-	if (ret < 0 || ret >= 18) {
-		return log_error_errno(false, EIO, "Failed to call snprintf()");
-	}
+	if (ret < 0)
+		return log_error_errno(false, EIO, "Failed to call strnprintf()");
 
 	return true;
 }