From: Christian Brauner Date: Thu, 11 Feb 2021 09:47:38 +0000 (+0100) Subject: start: convert to strnprintf() X-Git-Tag: lxc-5.0.0~292^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa60cd7bf326b1de92e33796e0f3ad2d5b7ef343;p=thirdparty%2Flxc.git start: convert to strnprintf() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/start.c b/src/lxc/start.c index 90ee8dbfe..3e22f512a 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -183,8 +183,8 @@ static bool match_dlog_fds(struct dirent *direntp) ssize_t linklen; int ret; - ret = snprintf(path, PATH_MAX, "/proc/self/fd/%s", direntp->d_name); - if (ret < 0 || ret >= PATH_MAX) + ret = strnprintf(path, sizeof(path), "/proc/self/fd/%s", direntp->d_name); + if (ret < 0) return log_error(false, "Failed to create file descriptor name"); linklen = readlink(path, link, PATH_MAX); @@ -1147,9 +1147,9 @@ static int do_start(void *data) if (handler->daemonize && !handler->conf->autodev) { char path[PATH_MAX]; - ret = snprintf(path, sizeof(path), "%s/dev/null", - handler->conf->rootfs.mount); - if (ret < 0 || ret >= sizeof(path)) + ret = strnprintf(path, sizeof(path), "%s/dev/null", + handler->conf->rootfs.mount); + if (ret < 0) goto out_warn_father; ret = access(path, F_OK); @@ -1749,8 +1749,8 @@ static int lxc_spawn(struct lxc_handler *handler) if (!lxc_can_use_pidfd(handler->pidfd)) close_prot_errno_disarm(handler->pidfd); - ret = snprintf(pidstr, 20, "%d", handler->pid); - if (ret < 0 || ret >= 20) + ret = strnprintf(pidstr, 20, "%d", handler->pid); + if (ret < 0) goto out_delete_net; ret = setenv("LXC_PID", pidstr, 1); @@ -2200,8 +2200,8 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler, } INFO("Destroyed rootfs for container \"%s\"", name); - ret = snprintf(destroy, PATH_MAX, "%s/%s", handler->lxcpath, name); - if (ret < 0 || ret >= PATH_MAX) { + ret = strnprintf(destroy, sizeof(destroy), "%s/%s", handler->lxcpath, name); + if (ret < 0) { ERROR("Error destroying directory for container \"%s\"", name); return; }