From: Ariel Miculas <amiculas@cisco.com>
Date: Tue, 7 Feb 2023 11:10:50 +0000 (+0200)
Subject: Fix strlcat's return value checks
X-Git-Tag: v6.0.0~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4275%2Fhead;p=thirdparty%2Flxc.git

Fix strlcat's return value checks

Alternatively we could have used safe_strlcat, but it's not used
anywhere and there's also no safe_strlcpy

Signed-off-by: Ariel Miculas <amiculas@cisco.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9158713c7..d2ab8ceda 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2212,7 +2212,7 @@ static int lxc_setup_console(const struct lxc_handler *handler,
 
 static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t size)
 {
-	ssize_t ret;
+	size_t ret;
 
 	/* If '=' is contained in opt, the option must go into data. */
 	if (!strchr(opt, '=')) {
@@ -2236,12 +2236,12 @@ static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t siz
 
 	if (strlen(*data)) {
 		ret = strlcat(*data, ",", size);
-		if (ret < 0)
+		if (ret >= size)
 			return log_error_errno(ret, errno, "Failed to append \",\" to %s", *data);
 	}
 
 	ret = strlcat(*data, opt, size);
-	if (ret < 0)
+	if (ret >= size)
 		return log_error_errno(ret, errno, "Failed to append \"%s\" to %s", opt, *data);
 
 	return 0;