packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
lxc/0035-codecheck-fix.patch
zhangxiaoyu dbbcadfc9c codecheck fix 
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 7e6d92b3dce2cff7d06c4073cce6a4d27514b239)
2023-09-07 14:17:45 +08:00

651 lines
20 KiB
Diff
Raw Permalink Blame History

From 103aff2c11b16a2b53b0339b0033a77b3348fec3 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Wed, 6 Sep 2023 15:14:06 +0800
Subject: [PATCH] codecheck fix
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
---
src/lxc/af_unix.c | 4 +--
src/lxc/attach.c | 2 +-
src/lxc/commands.c | 27 +++++++++++++----
src/lxc/conf.c | 46 +++++++++++++++++++++++++++--
src/lxc/exec_commands.c | 2 +-
src/lxc/file_utils.c | 2 +-
src/lxc/isulad_utils.c | 23 ++++++++++-----
src/lxc/json/json_common.c | 4 +--
src/lxc/path.c | 32 ++++++++++++++++++--
src/lxc/start.c | 60 +++++++++++++++++++++++++++++++-------
src/lxc/terminal.c | 24 ++++++++++++---
11 files changed, 186 insertions(+), 40 deletions(-)
diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index 0be9368..d98a1f9 100644
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -170,10 +170,10 @@ int lxc_unix_send_fds(int fd, int *sendfds, int num_sendfds, void *data,
#ifdef HAVE_ISULAD
static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
struct iovec *iov, size_t iovlen, unsigned int timeout)
-#else
+#else
static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
struct iovec *iov, size_t iovlen)
-#endif
+#endif
{
__do_free char *cmsgbuf = NULL;
int ret;
diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 24d020d..0ac37cc 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -735,7 +735,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
ret = sigfillset(&mask);
if (ret < 0) {
SYSERROR("Failed to fill signal mask");
- goto on_error;;
+ goto on_error;
}
ret = sigprocmask(SIG_UNBLOCK, &mask, NULL);
if (ret < 0) {
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index c2a5665..d6b9939 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1504,17 +1504,32 @@ int lxc_cmd_set_terminal_fifos(const char *name, const char *lxcpath, const char
const char *out_fifo, const char *err_fifo)
{
int ret = 0, stopped = 0;
- int len = 0;
+ size_t len = 0;
char *tmp = NULL;
const char *split = "&&&&", *none_fifo_name = "none";
const char *cmd_in_fifo = in_fifo ? in_fifo : none_fifo_name;
const char *cmd_out_fifo = out_fifo ? out_fifo : none_fifo_name;
const char *cmd_err_fifo = err_fifo ? err_fifo : none_fifo_name;
- if (len + strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) +
- strlen(split) + strlen(cmd_err_fifo) == SIZE_MAX)
+ if (name == NULL) {
return -1;
- len += strlen(cmd_in_fifo) + strlen(split) + strlen(cmd_out_fifo) + strlen(split) + strlen(cmd_err_fifo) + 1;
+ }
+
+ // format: cmd_in_fifo + split + cmd_out_fifo + split + cmd_err_fifo + '\0'
+ if (strlen(cmd_in_fifo) > SIZE_MAX - strlen(split) - strlen(split) - 1) {
+ return -1;
+ }
+ len += strlen(cmd_in_fifo) + strlen(split) + strlen(split) + 1;
+
+ if (strlen(cmd_out_fifo) > SIZE_MAX - len) {
+ return -1;
+ }
+ len += strlen(cmd_out_fifo);
+
+ if (strlen(cmd_err_fifo) > SIZE_MAX - len) {
+ return -1;
+ }
+ len += strlen(cmd_err_fifo);
tmp = malloc(len);
if (tmp == NULL)
return -1;
@@ -1556,7 +1571,7 @@ static int lxc_cmd_set_terminal_fifos_callback(int fd, struct lxc_cmd_req *req,
struct lxc_cmd_rsp rsp;
memset(&rsp, 0, sizeof(rsp));
- rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);;
+ rsp.ret = lxc_terminal_add_fifos(handler->conf, req->data);
return lxc_cmd_rsp_send(fd, &rsp);
}
@@ -1602,7 +1617,7 @@ static int lxc_cmd_set_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
struct lxc_cmd_set_terminal_winch_request *data = (struct lxc_cmd_set_terminal_winch_request *)(req->data);
memset(&rsp, 0, sizeof(rsp));
- rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);;
+ rsp.ret = lxc_set_terminal_winsz(&handler->conf->console, data->height, data->width);
return lxc_cmd_rsp_send(fd, &rsp);
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a5573ac..3e31691 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4640,7 +4640,11 @@ static struct lxc_list *get_minimal_idmap(const struct lxc_conf *conf,
int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
const char *fn_name)
{
+#ifdef HAVE_ISULAD
+ struct lxc_list *idmap = NULL;
+#else
call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
+#endif
int ret = -1, status = -1;
char c = '1';
struct userns_fn_data d = {
@@ -4659,8 +4663,16 @@ int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
return ret_errno(ENOENT);
ret = pipe2(pipe_fds, O_CLOEXEC);
+#ifdef HAVE_ISULAD
+ if (ret < 0) {
+ lxc_free_idmap(idmap);
+ free(idmap);
+ return -errno;
+ }
+#else
if (ret < 0)
return -errno;
+#endif
d.p[0] = pipe_fds[0];
d.p[1] = pipe_fds[1];
@@ -4710,6 +4722,11 @@ on_error:
if (status < 0)
ret = -1;
+#ifdef HAVE_ISULAD
+ lxc_free_idmap(idmap);
+ free(idmap);
+#endif
+
return ret;
}
@@ -4717,7 +4734,11 @@ int userns_exec_minimal(const struct lxc_conf *conf,
int (*fn_parent)(void *), void *fn_parent_data,
int (*fn_child)(void *), void *fn_child_data)
{
+#ifdef HAVE_ISULAD
+ struct lxc_list *idmap = NULL;
+#else
call_cleaner(lxc_free_idmap) struct lxc_list *idmap = NULL;
+#endif
uid_t resuid = LXC_INVALID_UID;
gid_t resgid = LXC_INVALID_GID;
char c = '1';
@@ -4733,8 +4754,16 @@ int userns_exec_minimal(const struct lxc_conf *conf,
return ret_errno(ENOENT);
ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, sock_fds);
+#ifdef HAVE_ISULAD
+ if (ret < 0) {
+ lxc_free_idmap(idmap);
+ free(idmap);
+ return -errno;
+ }
+#else
if (ret < 0)
return -errno;
+#endif
pid = fork();
if (pid < 0) {
@@ -4830,6 +4859,11 @@ on_error:
close_prot_errno_disarm(sock_fds[0]);
close_prot_errno_disarm(sock_fds[1]);
+#ifdef HAVE_ISULAD
+ lxc_free_idmap(idmap);
+ free(idmap);
+#endif
+
/* Wait for child to finish. */
if (pid < 0)
return -1;
@@ -5468,6 +5502,10 @@ int lxc_drop_caps(struct lxc_conf *conf)
struct lxc_list *caps = NULL;
int *caplist = NULL;
+ if (conf == NULL) {
+ return -1;
+ }
+
if (lxc_list_empty(&conf->keepcaps))
return 0;
@@ -5654,7 +5692,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
if (srcfd < 0)
return srcfd;
ret = snprintf(srcbuf, sizeof(srcbuf), "/proc/self/fd/%d", srcfd);
- if (ret < 0 || ret > sizeof(srcbuf)) {
+ if (ret < 0 || (size_t)ret >= sizeof(srcbuf)) {
close(srcfd);
ERROR("Failed to print string");
return -EINVAL;
@@ -5673,7 +5711,7 @@ static int mount_entry_with_loop_dev(const char *src, const char *dest, const ch
}
ret = snprintf(destbuf, sizeof(destbuf), "/proc/self/fd/%d", destfd);
- if (ret < 0 || ret > sizeof(destbuf)) {
+ if (ret < 0 || (size_t)ret >= sizeof(destbuf)) {
if (srcfd != -1)
close(srcfd);
close(destfd);
@@ -6245,6 +6283,7 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
size_t env_buf_len = 0;
tmpenv = getenv(lxc_envs[j]);
if (tmpenv && i < (result_len - 1)) {
+ int nret = 0;
if (strlen(tmpenv) > (SIZE_MAX - 1 - 1 - strlen(lxc_envs[j]))) {
lxc_free_array((void **)result, free);
return NULL;
@@ -6255,7 +6294,8 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
lxc_free_array((void **)result, free);
return NULL;
}
- if (snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envs[j], tmpenv) < 0) {
+ nret = snprintf(lxcenv_buf, env_buf_len, "%s=%s", lxc_envs[j], tmpenv);
+ if (nret < 0 || nret >= env_buf_len) {
free(lxcenv_buf);
continue;
}
diff --git a/src/lxc/exec_commands.c b/src/lxc/exec_commands.c
index 50246fa..52067e1 100644
--- a/src/lxc/exec_commands.c
+++ b/src/lxc/exec_commands.c
@@ -228,7 +228,7 @@ static int lxc_exec_cmd_set_terminal_winch_callback(int fd, struct lxc_exec_cmd_
struct lxc_exec_cmd_set_terminal_winch_request *data = (struct lxc_exec_cmd_set_terminal_winch_request *)(req->data);
memset(&rsp, 0, sizeof(rsp));
- rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);;
+ rsp.ret = lxc_set_terminal_winsz(handler->terminal, data->height, data->width);
return lxc_exec_cmd_rsp_send(fd, &rsp);
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 681207b..1c18769 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -128,7 +128,7 @@ ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
ssize_t nret = 0;
ssize_t nwritten;
- if (buf == NULL) {
+ if (fd < 0 || buf == NULL) {
return -1;
}
diff --git a/src/lxc/isulad_utils.c b/src/lxc/isulad_utils.c
index ee39302..c71bb5b 100644
--- a/src/lxc/isulad_utils.c
+++ b/src/lxc/isulad_utils.c
@@ -42,14 +42,14 @@ int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
{
void *tmp = NULL;
- if (newsize == 0) {
- goto err_out;
+ if (newptr == NULL || newsize == 0) {
+ return -1;
}
tmp = lxc_common_calloc_s(newsize);
if (tmp == NULL) {
ERROR("Failed to malloc memory");
- goto err_out;
+ return -1;
}
if (oldptr != NULL) {
@@ -62,9 +62,6 @@ int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
*newptr = tmp;
return 0;
-
-err_out:
- return -1;
}
char *safe_strdup(const char *src)
@@ -87,6 +84,10 @@ int lxc_open(const char *filename, int flags, mode_t mode)
{
char rpath[PATH_MAX] = {0x00};
+ if (filename == NULL) {
+ return -1;
+ }
+
if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
return -1;
}
@@ -101,6 +102,10 @@ FILE *lxc_fopen(const char *filename, const char *mode)
{
char rpath[PATH_MAX] = {0x00};
+ if (filename == NULL || mode == NULL || strlen(mode) == 0) {
+ return NULL;
+ }
+
if (cleanpath(filename, rpath, sizeof(rpath)) == NULL) {
return NULL;
}
@@ -137,6 +142,10 @@ int lxc_file2str(const char *filename, char ret[], int cap)
{
int fd, num_read;
+ if (filename == NULL || ret == NULL || cap == 0) {
+ return -1;
+ }
+
if ((fd = lxc_open(filename, O_RDONLY | O_CLOEXEC, 0)) == -1)
return -1;
if ((num_read = read(fd, ret, cap - 1)) <= 0)
@@ -455,7 +464,7 @@ static int parse_line_pw(const char delim, char *line, struct passwd *result)
return 0;
}
-char *util_left_trim_space(char *str)
+static char *util_left_trim_space(char *str)
{
char *begin = str;
char *tmp = str;
diff --git a/src/lxc/json/json_common.c b/src/lxc/json/json_common.c
index ec20c59..dd4dfcd 100755
--- a/src/lxc/json/json_common.c
+++ b/src/lxc/json/json_common.c
@@ -682,7 +682,7 @@ yajl_gen_status gen_json_map_int_string(void *ctx, json_map_int_string *map, str
if (yajl_gen_status_ok != stat) {
GEN_SET_ERROR_AND_RETURN(stat, err);
}
- stat = reformat_string(g, map->values[i], strlen(map->values[i]));;
+ stat = reformat_string(g, map->values[i], strlen(map->values[i]));
if (yajl_gen_status_ok != stat) {
GEN_SET_ERROR_AND_RETURN(stat, err);
}
@@ -1048,7 +1048,7 @@ yajl_gen_status gen_json_map_string_string(void *ctx, json_map_string_string *ma
if (yajl_gen_status_ok != stat) {
GEN_SET_ERROR_AND_RETURN(stat, err);
}
- stat = reformat_string(g, map->values[i], strlen(map->values[i]));;
+ stat = reformat_string(g, map->values[i], strlen(map->values[i]));
if (yajl_gen_status_ok != stat) {
GEN_SET_ERROR_AND_RETURN(stat, err);
}
diff --git a/src/lxc/path.c b/src/lxc/path.c
index c0529b7..25dd68d 100644
--- a/src/lxc/path.c
+++ b/src/lxc/path.c
@@ -30,6 +30,10 @@ bool specify_current_dir(const char *path)
char *basec = NULL, *bname = NULL;
bool res = false;
+ if (path == NULL) {
+ return false;
+ }
+
basec = safe_strdup(path);
bname = basename(basec);
@@ -59,6 +63,10 @@ char *preserve_trailing_dot_or_separator(const char *cleanedpath,
char *respath = NULL;
size_t len;
+ if (cleanedpath == NULL || originalpath == NULL) {
+ return NULL;
+ }
+
if (strlen(cleanedpath) > (SIZE_MAX - 3)) {
return NULL;
}
@@ -96,6 +104,10 @@ bool filepath_split(const char *path, char **dir, char **base)
ssize_t i;
size_t len;
+ if (path == NULL || dir == NULL || base == NULL) {
+ return false;
+ }
+
len = strlen(path);
if (len >= PATH_MAX) {
ERROR("Invalid path");
@@ -138,7 +150,7 @@ static bool do_clean_path_continue(const char *endpos, const char *stpos, const
return false;
}
-int do_clean_path(const char *respath, const char *limit_respath,
+static int do_clean_path(const char *respath, const char *limit_respath,
const char *stpos, char **dst)
{
char *dest = *dst;
@@ -515,6 +527,11 @@ char *follow_symlink_in_scope(const char *fullpath, const char *rootpath)
char resfull[PATH_MAX] = {0}, *full = NULL;
char resroot[PATH_MAX] = {0}, *root = NULL;
+ if (fullpath == NULL || rootpath == NULL) {
+ ERROR("Invalid arguments");
+ return NULL;
+ }
+
full = cleanpath(fullpath, resfull, PATH_MAX);
if (!full) {
ERROR("Failed to get cleaned path");
@@ -544,6 +561,7 @@ int get_resource_path(const char *rootpath, const char *path,
char resolved[PATH_MAX] = {0}, *cleanedpath = NULL;
char *fullpath = NULL;
size_t len;
+ int nret = 0;
if (!rootpath || !path || !scopepath)
return -1;
@@ -562,7 +580,12 @@ int get_resource_path(const char *rootpath, const char *path,
ERROR("Out of memory");
return -1;
}
- snprintf(fullpath, len, "%s%s", rootpath, cleanedpath);
+ nret = snprintf(fullpath, len, "%s%s", rootpath, cleanedpath);
+ if (nret < 0 || nret >= len) {
+ ERROR("Failed to snprintf");
+ free(fullpath);
+ return -1;
+ }
*scopepath = follow_symlink_in_scope(fullpath, rootpath);
@@ -584,6 +607,11 @@ char *path_relative(const char *basepath, const char *targpath)
char restarg[PATH_MAX] = {0}, *targ = NULL;
size_t bl = 0, tl = 0, b0 = 0, bi = 0, t0 = 0, ti = 0;
+ if (basepath == NULL || targpath == NULL) {
+ ERROR("Invalid arguments");
+ return NULL;
+ }
+
base = cleanpath(basepath, resbase, PATH_MAX);
if (!base) {
ERROR("Failed to get cleaned path");
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 6fe1203..5de444d 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -906,7 +906,7 @@ struct start_timeout_conf {
int errfd;
};
-void trim_line(char *s)
+static void trim_line(char *s)
{
size_t len;
@@ -1005,7 +1005,7 @@ static int _recursive_read_cgroup_procs(const char *dirpath, pid_t **pids, size_
return failed ? -1 : 0;
}
-int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
+static int get_all_pids(struct cgroup_ops *cg_ops, pid_t **pids, size_t *len)
{
const char *devices_path = NULL;
@@ -2875,6 +2875,7 @@ static int clean_resource_set_env(struct lxc_handler *handler)
}
for (; i < conf->ocihooks->poststop_len; i++) {
+ int nret = 0;
size_t cap = conf->ocihooks->poststop[i]->env_len;
size_t newcap = cap + len + 1;
if (lxc_grow_array((void ***)&(conf->ocihooks->poststop[i]->env), &cap, newcap, 1) != 0) {
@@ -2883,38 +2884,70 @@ static int clean_resource_set_env(struct lxc_handler *handler)
j = conf->ocihooks->poststop[i]->env_len;
/* Start of environment variable setup for hooks. */
if (name) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_NAME=%s", name);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
if (conf->rcfile) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONFIG_FILE=%s", conf->rcfile);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
if (conf->rootfs.mount) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_MOUNT=%s", conf->rootfs.mount);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
if (conf->rootfs.path) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_ROOTFS_PATH=%s", conf->rootfs.path);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
if (conf->console.path) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE=%s", conf->console.path);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
if (conf->console.log_path) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CONSOLE_LOGPATH=%s", conf->console.log_path);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
conf->ocihooks->poststop[i]->env[j++] = safe_strdup("LXC_CGNS_AWARE=1");
+ conf->ocihooks->poststop[i]->env_len++;
- snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_PID=%d", handler->pid);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
if (handler->cgroup_ops->container_cgroup) {
- snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
+ nret = snprintf(bufstr, PATH_MAX + 1, "LXC_CGROUP_PATH=%s", handler->cgroup_ops->container_cgroup);
+ if (nret < 0 || nret > PATH_MAX) {
+ return -1;
+ }
conf->ocihooks->poststop[i]->env[j++] = safe_strdup(bufstr);
+ conf->ocihooks->poststop[i]->env_len++;
}
- conf->ocihooks->poststop[i]->env_len = j;
/* End of environment variable setup for hooks. */
}
return 0;
@@ -3075,6 +3108,11 @@ int do_lxcapi_get_pids(char *name, char *lxcpath, struct lxc_conf *conf, pid_t *
struct lxc_handler *handler = NULL;
struct cgroup_ops *cg_ops = NULL;
+ if (conf == NULL || pids == NULL || pids_len == NULL) {
+ ERROR("Invalid arguments");
+ return -1;
+ }
+
handler = lxc_init_pids_handler(name, lxcpath, conf);
if (!handler) {
ERROR("Failed to init container %s clean handler", name);
diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 0539eca..88d4d94 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -194,6 +194,11 @@ int lxc_set_terminal_winsz(struct lxc_terminal *terminal, unsigned int height, u
int ret = 0;
struct winsize wsz;
+ if (terminal == NULL) {
+ ERROR("Invalid arguments");
+ return -1;
+ }
+
if (terminal->ptmx < 0) {
return 0;
}
@@ -225,6 +230,10 @@ static int lxc_terminal_rename_old_log_file(struct lxc_terminal *terminal)
char tmp[PATH_MAX] = {0};
char *rename_fname = NULL;
+ if (terminal->log_rotate == 0) {
+ return 0;
+ }
+
for (i = terminal->log_rotate - 1; i > 1; i--) {
ret = snprintf(tmp, PATH_MAX, "%s.%u", terminal->log_path, i);
if (ret < 0 || ret >= PATH_MAX) {
@@ -413,10 +422,12 @@ static bool get_time_buffer(struct timespec *timestamp, char *timebuffer,
seconds = (time_t)timestamp->tv_sec;
gmtime_r(&seconds, &tm_utc);
- strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
+ len = strftime(timebuffer, maxsize, "%Y-%m-%dT%H:%M:%S", &tm_utc);
+ if (len == 0) {
+ return false;
+ }
nanos = (int32_t)timestamp->tv_nsec;
- len = strlen(timebuffer);
ret = snprintf(timebuffer + len, (maxsize - len), ".%09dZ", nanos);
if (ret < 0 || ret >= (maxsize - len)) {
return false;
@@ -1548,7 +1559,7 @@ static int terminal_fifo_open(const char *fifo_path, int flags)
return fd;
}
-bool fifo_exists(const char *path)
+static bool fifo_exists(const char *path)
{
struct stat sb;
int ret;
@@ -1715,11 +1726,16 @@ err:
int lxc_terminal_add_fifos(struct lxc_conf *conf, const char *fifonames)
{
int ret = 0;
- struct lxc_terminal *terminal = &conf->console;
+ struct lxc_terminal *terminal = NULL;
int fifofd_in = -1;
char *tmp = NULL, *saveptr = NULL, *in = NULL, *out = NULL, *err = NULL;
const char *none_fifo_name = "none";
+ if (conf == NULL || fifonames == NULL) {
+ return -1;
+ }
+
+ terminal = &conf->console;
tmp = safe_strdup(fifonames);
in = strtok_r(tmp, "&&&&", &saveptr);
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink