From 9a607a8212db01af57616c36eb55ba4b4887b454 Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Mon, 17 Oct 2022 12:12:25 +0900 Subject: [PATCH] Fix static analysis issues Change-Id: I6ef67f0f1b6423756955a94370fbcee51b1d81ee Signed-off-by: Changgyu Choi --- src/launchpad-process-pool/src/launchpad.c | 6 ++-- src/lib/common/src/launchpad_common.c | 8 ++--- src/lib/common/src/launchpad_socket.c | 58 +++++++++++++++--------------- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/launchpad-process-pool/src/launchpad.c b/src/launchpad-process-pool/src/launchpad.c index 1ba060b..83e1d21 100644 --- a/src/launchpad-process-pool/src/launchpad.c +++ b/src/launchpad-process-pool/src/launchpad.c @@ -93,7 +93,7 @@ typedef struct { int type; bool prepared; int pid; /* for hydra this pid is not the pid of hydra itself */ - /* but pid of non-hydra candidate, which was forked from hydra */ + /* but pid of non-hydra candidate, which was forked from hydra */ int hydra_pid; int loader_id; int caller_pid; @@ -627,7 +627,7 @@ static int __accept_candidate_process(int server_fd, int *out_client_fd, goto error; } - len = sizeof(cred); + len = (socklen_t)sizeof(cred); ret = getsockopt(client_fd, SOL_SOCKET, SO_PEERCRED, &cred, &len); if (ret < 0) { _E("getsockopt error"); @@ -847,7 +847,7 @@ static void __set_live_timer(candidate_process_context_t *cpc) static int __hydra_send_request(int fd, enum hydra_cmd cmd) { int sent = 0; - int size = sizeof(cmd); + int size = (int)sizeof(cmd); int send_ret = 0; while (sent != size) { diff --git a/src/lib/common/src/launchpad_common.c b/src/lib/common/src/launchpad_common.c index 0717c95..0db3125 100644 --- a/src/lib/common/src/launchpad_common.c +++ b/src/lib/common/src/launchpad_common.c @@ -415,12 +415,10 @@ retry_recv: app_pkt_t *_accept_recv_pkt_raw(int fd, int *clifd, struct ucred *cr) { struct sockaddr_un aul_addr = { 0, }; - int sun_size; + int sun_size = (int)sizeof(struct sockaddr_un); app_pkt_t *pkt; int newfd; - int cl = sizeof(struct ucred); - - sun_size = sizeof(struct sockaddr_un); + int cl = (int)sizeof(struct ucred); newfd = accept(fd, (struct sockaddr *)&aul_addr, (socklen_t *) &sun_size); @@ -1513,7 +1511,7 @@ void _print_hwc_log(const char *format, ...) static int __get_mount_opt(const char *srcs[], size_t srcs_len, const char *dest, char *opt, size_t opt_len) { - int i; + size_t i; char buf[PATH_MAX]; int ret; diff --git a/src/lib/common/src/launchpad_socket.c b/src/lib/common/src/launchpad_socket.c index a79905b..16241f7 100644 --- a/src/lib/common/src/launchpad_socket.c +++ b/src/lib/common/src/launchpad_socket.c @@ -42,26 +42,26 @@ struct socket_s { static int __set_socket_option(int fd, bool client) { - struct timeval tv = { 5, 200 * 1000 }; /* 5.2 sec */ - int size = LAUNCHPAD_SOCKET_MAX_BUFF; - int flag; - int ret; + struct timeval tv = { 5, 200 * 1000 }; /* 5.2 sec */ + int size = LAUNCHPAD_SOCKET_MAX_BUFF; + int flag; + int ret; - ret = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)); - if (ret < 0) { + ret = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)); + if (ret < 0) { ret = -errno; _E("setsockopt(SO_SNDBUF) is failed. fd(%d), errno(%d)", fd, errno); - return ret; - } + return ret; + } - ret = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)); - if (ret < 0) { + ret = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)); + if (ret < 0) { ret = -errno; _E("setsockopt(SO_RCVBUF) is failed. fd(%d), errno(%d)", fd, errno); - return ret; - } + return ret; + } if (!client) return 0; @@ -83,7 +83,7 @@ static int __set_socket_option(int fd, bool client) return ret; } - return 0; + return 0; } static int __create_server_socket(const char *path) @@ -136,27 +136,27 @@ static int __create_client_socket(const char *path) int fd; fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (fd < 0) { + if (fd < 0) { ret = -errno; _E("socket() is failed. path(%s), errno(%d)", path, errno); - return ret; - } + return ret; + } - addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path); - while (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - if (errno != ETIMEDOUT || retry <= 0) { + addr.sun_family = AF_UNIX; + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path); + while (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + if (errno != ETIMEDOUT || retry <= 0) { ret = -errno; _E("connect() is failed. path(%s), errno(%d)", path, errno); - close(fd); - return ret; - } + close(fd); + return ret; + } - usleep(LAUNCHPAD_SOCKET_RETRY_TIME); - retry--; - _W("Retry(%d) to connect to %s", retry, path); - } + usleep(LAUNCHPAD_SOCKET_RETRY_TIME); + retry--; + _W("Retry(%d) to connect to %s", retry, path); + } ret = __set_socket_option(fd, true); if (ret < 0) { @@ -273,8 +273,8 @@ int _socket_accept(socket_h handle, socket_h *client_socket) struct socket_s *sock; struct sockaddr_un addr = { 0, }; struct ucred cred = { 0, }; - socklen_t addr_size = sizeof(struct sockaddr_un); - socklen_t cred_size = sizeof(struct ucred); + socklen_t addr_size = (socklen_t)sizeof(struct sockaddr_un); + socklen_t cred_size = (socklen_t)sizeof(struct ucred); int client_fd; int ret; -- 2.7.4