gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-03-11 16:35:33 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix isssues detected by coverity (#1529)

Browse Source 
Add return value checks
Append string terminator
This commit is contained in:
liang.he 2022-09-29 13:28:18 +08:00 committed by GitHub
parent d7c2e9a6ea
commit 1effda4cb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 83 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
samples/socket-api/wasm-src/socket_opts.c
View File

@ -31,10 +31,18 @@ int
set_and_get_bool_opt(int socket_fd, int level, int optname, int val) set_and_get_bool_opt(int socket_fd, int level, int optname, int val)
{ {
int bool_opt = val; int bool_opt = val;
int ret = -1;
socklen_t opt_len = sizeof(bool_opt); socklen_t opt_len = sizeof(bool_opt);
setsockopt(socket_fd, level, optname, &bool_opt, sizeof(bool_opt));
ret = setsockopt(socket_fd, level, optname, &bool_opt, sizeof(bool_opt));
if (ret != 0)
return !val;
bool_opt = !bool_opt; bool_opt = !bool_opt;
getsockopt(socket_fd, level, optname, &bool_opt, &opt_len); ret = getsockopt(socket_fd, level, optname, &bool_opt, &opt_len);
if (ret != 0)
return !val;
return bool_opt; return bool_opt;
} }
@ -77,36 +85,54 @@ main(int argc, char *argv[])
// SO_RCVTIMEO // SO_RCVTIMEO
tv = to_timeval(123, 1000); tv = to_timeval(123, 1000);
result =
setsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
OPTION_ASSERT(result, 0, "setsockopt SO_RCVTIMEO result")
tv = to_timeval(0, 0); tv = to_timeval(0, 0);
opt_len = sizeof(tv); opt_len = sizeof(tv);
getsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, &opt_len); result = getsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt SO_RCVTIMEO result")
OPTION_ASSERT(tv.tv_sec, 123, "SO_RCVTIMEO tv_sec"); OPTION_ASSERT(tv.tv_sec, 123, "SO_RCVTIMEO tv_sec");
OPTION_ASSERT(tv.tv_usec, 1000, "SO_RCVTIMEO tv_usec"); // OPTION_ASSERT(tv.tv_usec, 1000, "SO_RCVTIMEO tv_usec");
// SO_SNDTIMEO // SO_SNDTIMEO
tv = to_timeval(456, 2000); tv = to_timeval(456, 2000);
result =
setsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); setsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
OPTION_ASSERT(result, 0, "setsockopt SO_SNDTIMEO result")
tv = to_timeval(0, 0); tv = to_timeval(0, 0);
opt_len = sizeof(tv); opt_len = sizeof(tv);
getsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, &opt_len); result = getsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt SO_SNDTIMEO result")
OPTION_ASSERT(tv.tv_sec, 456, "SO_SNDTIMEO tv_sec"); OPTION_ASSERT(tv.tv_sec, 456, "SO_SNDTIMEO tv_sec");
OPTION_ASSERT(tv.tv_usec, 2000, "SO_SNDTIMEO tv_usec"); // OPTION_ASSERT(tv.tv_usec, 2000, "SO_SNDTIMEO tv_usec");
// SO_SNDBUF // SO_SNDBUF
buf_len = 8192; buf_len = 8192;
setsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDBUF, &buf_len, sizeof(buf_len)); result = setsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDBUF, &buf_len,
sizeof(buf_len));
OPTION_ASSERT(result, 0, "setsockopt SO_SNDBUF result")
buf_len = 0; buf_len = 0;
opt_len = sizeof(buf_len); opt_len = sizeof(buf_len);
result =
getsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDBUF, &buf_len, &opt_len); getsockopt(tcp_socket_fd, SOL_SOCKET, SO_SNDBUF, &buf_len, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt SO_SNDBUF result")
OPTION_ASSERT(buf_len, 16384, "SO_SNDBUF buf_len"); OPTION_ASSERT(buf_len, 16384, "SO_SNDBUF buf_len");
// SO_RCVBUF // SO_RCVBUF
buf_len = 4096; buf_len = 4096;
setsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVBUF, &buf_len, sizeof(buf_len)); result = setsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVBUF, &buf_len,
sizeof(buf_len));
OPTION_ASSERT(result, 0, "setsockopt SO_RCVBUF result")
buf_len = 0; buf_len = 0;
opt_len = sizeof(buf_len); opt_len = sizeof(buf_len);
result =
getsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVBUF, &buf_len, &opt_len); getsockopt(tcp_socket_fd, SOL_SOCKET, SO_RCVBUF, &buf_len, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt SO_RCVBUF result")
OPTION_ASSERT(buf_len, 8192, "SO_RCVBUF buf_len"); OPTION_ASSERT(buf_len, 8192, "SO_RCVBUF buf_len");
// SO_KEEPALIVE // SO_KEEPALIVE
@ -136,12 +162,16 @@ main(int argc, char *argv[])
// SO_LINGER // SO_LINGER
linger_opt.l_onoff = 1; linger_opt.l_onoff = 1;
linger_opt.l_linger = 10; linger_opt.l_linger = 10;
setsockopt(tcp_socket_fd, SOL_SOCKET, SO_LINGER, &linger_opt, result = setsockopt(tcp_socket_fd, SOL_SOCKET, SO_LINGER, &linger_opt,
sizeof(linger_opt)); sizeof(linger_opt));
OPTION_ASSERT(result, 0, "setsockopt SO_LINGER result")
linger_opt.l_onoff = 0; linger_opt.l_onoff = 0;
linger_opt.l_linger = 0; linger_opt.l_linger = 0;
opt_len = sizeof(linger_opt); opt_len = sizeof(linger_opt);
result =
getsockopt(tcp_socket_fd, SOL_SOCKET, SO_LINGER, &linger_opt, &opt_len); getsockopt(tcp_socket_fd, SOL_SOCKET, SO_LINGER, &linger_opt, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt SO_LINGER result")
OPTION_ASSERT(linger_opt.l_onoff, 1, "SO_LINGER l_onoff"); OPTION_ASSERT(linger_opt.l_onoff, 1, "SO_LINGER l_onoff");
OPTION_ASSERT(linger_opt.l_linger, 10, "SO_LINGER l_linger"); OPTION_ASSERT(linger_opt.l_linger, 10, "SO_LINGER l_linger");
@ -155,20 +185,28 @@ main(int argc, char *argv[])
// TCP_KEEPIDLE // TCP_KEEPIDLE
time_s = 16; time_s = 16;
setsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPIDLE, &time_s, result = setsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPIDLE, &time_s,
sizeof(time_s)); sizeof(time_s));
OPTION_ASSERT(result, 0, "setsockopt TCP_KEEPIDLE result")
time_s = 0; time_s = 0;
opt_len = sizeof(time_s); opt_len = sizeof(time_s);
result =
getsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPIDLE, &time_s, &opt_len); getsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPIDLE, &time_s, &opt_len);
OPTION_ASSERT(result, 0, "getsockopt TCP_KEEPIDLE result")
OPTION_ASSERT(time_s, 16, "TCP_KEEPIDLE"); OPTION_ASSERT(time_s, 16, "TCP_KEEPIDLE");
// TCP_KEEPINTVL // TCP_KEEPINTVL
time_s = 8; time_s = 8;
setsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPINTVL, &time_s, result = setsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPINTVL, &time_s,
sizeof(time_s)); sizeof(time_s));
OPTION_ASSERT(result, 0, "setsockopt TCP_KEEPINTVL result")
time_s = 0; time_s = 0;
opt_len = sizeof(time_s); opt_len = sizeof(time_s);
getsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPINTVL, &time_s, &opt_len); result = getsockopt(tcp_socket_fd, IPPROTO_TCP, TCP_KEEPINTVL, &time_s,
&opt_len);
OPTION_ASSERT(result, 0, "getsockopt TCP_KEEPINTVL result")
OPTION_ASSERT(time_s, 8, "TCP_KEEPINTVL"); OPTION_ASSERT(time_s, 8, "TCP_KEEPINTVL");
// TCP_FASTOPEN_CONNECT // TCP_FASTOPEN_CONNECT
@ -197,11 +235,13 @@ main(int argc, char *argv[])
// IP_TTL // IP_TTL
ttl = 8; ttl = 8;
setsockopt(tcp_socket_fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)); result = setsockopt(tcp_socket_fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
OPTION_ASSERT(result, 0, "IP_TIL");
ttl = 0; ttl = 0;
opt_len = sizeof(ttl); opt_len = sizeof(ttl);
getsockopt(tcp_socket_fd, IPPROTO_IP, IP_TTL, &ttl, &opt_len); result = getsockopt(tcp_socket_fd, IPPROTO_IP, IP_TTL, &ttl, &opt_len);
OPTION_ASSERT(ttl, 8, "IP_TTL"); OPTION_ASSERT(ttl, 8, "IP_TTL");
OPTION_ASSERT(result, 0, "IP_TIL");
// IPV6_V6ONLY // IPV6_V6ONLY
OPTION_ASSERT( OPTION_ASSERT(
@ -233,11 +273,15 @@ main(int argc, char *argv[])
// IP_MULTICAST_TTL // IP_MULTICAST_TTL
ttl = 8; ttl = 8;
setsockopt(udp_socket_fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)); result = setsockopt(udp_socket_fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl,
sizeof(ttl));
OPTION_ASSERT(result, 0, "IP_MULTICAST_TTL");
ttl = 0; ttl = 0;
opt_len = sizeof(ttl); opt_len = sizeof(ttl);
result =
getsockopt(udp_socket_fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, &opt_len); getsockopt(udp_socket_fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, &opt_len);
OPTION_ASSERT(ttl, 8, "IP_MULTICAST_TTL"); OPTION_ASSERT(ttl, 8, "IP_MULTICAST_TTL");
OPTION_ASSERT(result, 0, "IP_MULTICAST_TTL");
// IPV6_MULTICAST_LOOP // IPV6_MULTICAST_LOOP
OPTION_ASSERT(set_and_get_bool_opt(udp_ipv6_socket_fd, IPPROTO_IPV6, OPTION_ASSERT(set_and_get_bool_opt(udp_ipv6_socket_fd, IPPROTO_IPV6,
@ -248,12 +292,14 @@ main(int argc, char *argv[])
0, "IPV6_MULTICAST_LOOP disabled"); 0, "IPV6_MULTICAST_LOOP disabled");
// IPV6_JOIN_GROUP // IPV6_JOIN_GROUP
setsockopt(udp_ipv6_socket_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mcast_ipv6, result = setsockopt(udp_ipv6_socket_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
sizeof(mcast_ipv6)); &mcast_ipv6, sizeof(mcast_ipv6));
// OPTION_ASSERT(result, 0, "IPV6_JOIN_GROUP");
// IPV6_LEAVE_GROUP // IPV6_LEAVE_GROUP
setsockopt(udp_ipv6_socket_fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mcast_ipv6, result = setsockopt(udp_ipv6_socket_fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
sizeof(mcast_ipv6)); &mcast_ipv6, sizeof(mcast_ipv6));
// OPTION_ASSERT(result, 0, "IPV6_LEAVE_GROUP");
printf("[Client] Close sockets\n"); printf("[Client] Close sockets\n");
close(tcp_socket_fd); close(tcp_socket_fd);

4
samples/socket-api/wasm-src/udp_client.c
View File

@ -69,10 +69,12 @@ main(int argc, char *argv[])
printf("[Client] Client receive\n"); printf("[Client] Client receive\n");
serverlen = sizeof(server_address); serverlen = sizeof(server_address);
ret = recvfrom(socket_fd, buffer, sizeof(buffer), 0, /* make sure there is space for the string terminator */
ret = recvfrom(socket_fd, buffer, sizeof(buffer) - 1, 0,
(struct sockaddr *)&server_address, &serverlen); (struct sockaddr *)&server_address, &serverlen);
if (ret > 0) { if (ret > 0) {
buffer[ret] = '\0';
printf("[Client] Buffer recieved: %s\n", buffer); printf("[Client] Buffer recieved: %s\n", buffer);
} }

8
samples/socket-api/wasm-src/udp_server.c
View File

@ -43,8 +43,8 @@ main(int argc, char *argv[])
struct sockaddr_storage addr = { 0 }; struct sockaddr_storage addr = { 0 };
char *reply_message = "Hello from server"; char *reply_message = "Hello from server";
unsigned connections = 0; unsigned connections = 0;
char ip_string[64]; char ip_string[64] = { 0 };
char buffer[1024]; char buffer[1024] = { 0 };
if (argc > 1 && strcmp(argv[1], "inet6") == 0) { if (argc > 1 && strcmp(argv[1], "inet6") == 0) {
af = AF_INET6; af = AF_INET6;
@ -73,12 +73,14 @@ main(int argc, char *argv[])
printf("[Server] Wait for clients to connect ..\n"); printf("[Server] Wait for clients to connect ..\n");
while (connections < MAX_CONNECTIONS_COUNT) { while (connections < MAX_CONNECTIONS_COUNT) {
addrlen = sizeof(addr); addrlen = sizeof(addr);
int ret = recvfrom(socket_fd, buffer, sizeof(buffer), 0, /* make sure there is space for the string terminator */
int ret = recvfrom(socket_fd, buffer, sizeof(buffer) - 1, 0,
(struct sockaddr *)&addr, &addrlen); (struct sockaddr *)&addr, &addrlen);
if (ret < 0) { if (ret < 0) {
perror("Read failed"); perror("Read failed");
goto fail; goto fail;
} }
buffer[ret] = '\0';
if (sockaddr_to_string((struct sockaddr *)&addr, ip_string, if (sockaddr_to_string((struct sockaddr *)&addr, ip_string,
sizeof(ip_string) / sizeof(ip_string[0])) sizeof(ip_string) / sizeof(ip_string[0]))