From 311bb8c53eb2df925fa742193534d41157660e93 Mon Sep 17 00:00:00 2001 From: Ariel Miculas Date: Tue, 7 Feb 2023 13:10:50 +0200 Subject: [PATCH] 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 --- src/lxc/conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.47.2