Skip to content

Commit

Permalink
start: convert to strnprintf()
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Feb 26, 2021
1 parent 2b41604 commit 62eda13
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/lxc/start.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -1688,8 +1688,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);
Expand Down Expand Up @@ -2125,8 +2125,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;
}
Expand Down

0 comments on commit 62eda13

Please sign in to comment.