From c829cc09a491b21a41d0c60cbd9e0ddf2e9eec0c Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 11 Feb 2021 10:45:14 +0100 Subject: [PATCH] rexec: convert to strnprintf() Signed-off-by: Christian Brauner --- src/lxc/rexec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lxc/rexec.c b/src/lxc/rexec.c index 501aeedb7f..b0bb9050cb 100644 --- a/src/lxc/rexec.c +++ b/src/lxc/rexec.c @@ -98,9 +98,9 @@ static void lxc_rexec_as_memfd(char **argv, char **envp, const char *memfd_name) if (memfd < 0) { char template[PATH_MAX]; - ret = snprintf(template, sizeof(template), - P_tmpdir "/.%s_XXXXXX", memfd_name); - if (ret < 0 || (size_t)ret >= sizeof(template)) + ret = strnprintf(template, sizeof(template), + P_tmpdir "/.%s_XXXXXX", memfd_name); + if (ret < 0) return; tmpfd = lxc_make_tmpfile(template, true); @@ -151,8 +151,8 @@ static void lxc_rexec_as_memfd(char **argv, char **envp, const char *memfd_name) } else { char procfd[LXC_PROC_PID_FD_LEN]; - ret = snprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", tmpfd); - if (ret < 0 || (size_t)ret >= sizeof(procfd)) + ret = strnprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", tmpfd); + if (ret < 0) return; execfd = open(procfd, O_PATH | O_CLOEXEC);