gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-10-24 18:01:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

libc-wasi: add missing pointer validations to socket functions (#4611)

Browse Source 
cf. https://github.com/bytecodealliance/wasm-micro-runtime/issues/4463

the fix for sock_addr_resolve is incomplete.
cf. https://github.com/bytecodealliance/wasm-micro-runtime/issues/4610
This commit is contained in:
YAMAMOTO Takashi 2025-09-14 15:02:48 +09:00 committed by GitHub
parent 4f86468670
commit 5e779b3d7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c
View File

@ -1159,6 +1159,9 @@ wasi_sock_accept(wasm_exec_env_t exec_env, wasi_fd_t fd, wasi_fdflags_t flags,
if (!wasi_ctx) if (!wasi_ctx)
return __WASI_EACCES; return __WASI_EACCES;
if (!validate_native_addr(fd_new, sizeof(*fd_new)))
return __WASI_EINVAL;
curfds = wasi_ctx_get_curfds(wasi_ctx); curfds = wasi_ctx_get_curfds(wasi_ctx);
return wasi_ssp_sock_accept(exec_env, curfds, fd, flags, fd_new); return wasi_ssp_sock_accept(exec_env, curfds, fd, flags, fd_new);
@ -1217,6 +1220,19 @@ wasi_sock_addr_resolve(wasm_exec_env_t exec_env, const char *host,
if (!wasi_ctx) if (!wasi_ctx)
return __WASI_EACCES; return __WASI_EACCES;
if (!validate_native_addr(hints, sizeof(*hints)))
return __WASI_EINVAL;
uint64_t addr_info_byte_size = sizeof(*addr_info) * addr_info_size;
if (addr_info_byte_size / addr_info_size != sizeof(*addr_info))
return __WASI_EINVAL;
if (!validate_native_addr(addr_info, addr_info_byte_size))
return __WASI_EINVAL;
if (!validate_native_addr(max_info_size, sizeof(*max_info_size)))
return __WASI_EINVAL;
curfds = wasi_ctx_get_curfds(wasi_ctx); curfds = wasi_ctx_get_curfds(wasi_ctx);
ns_lookup_list = wasi_ctx_get_ns_lookup_list(wasi_ctx); ns_lookup_list = wasi_ctx_get_ns_lookup_list(wasi_ctx);
@ -1236,6 +1252,9 @@ wasi_sock_bind(wasm_exec_env_t exec_env, wasi_fd_t fd, wasi_addr_t *addr)
if (!wasi_ctx) if (!wasi_ctx)
return __WASI_EACCES; return __WASI_EACCES;
if (!validate_native_addr(addr, sizeof(*addr)))
return __WASI_EINVAL;
curfds = wasi_ctx_get_curfds(wasi_ctx); curfds = wasi_ctx_get_curfds(wasi_ctx);
addr_pool = wasi_ctx_get_addr_pool(wasi_ctx); addr_pool = wasi_ctx_get_addr_pool(wasi_ctx);
@ -1262,6 +1281,9 @@ wasi_sock_connect(wasm_exec_env_t exec_env, wasi_fd_t fd, wasi_addr_t *addr)
if (!wasi_ctx) if (!wasi_ctx)
return __WASI_EACCES; return __WASI_EACCES;
if (!validate_native_addr(addr, sizeof(*addr)))
return __WASI_EINVAL;
curfds = wasi_ctx_get_curfds(wasi_ctx); curfds = wasi_ctx_get_curfds(wasi_ctx);
addr_pool = wasi_ctx_get_addr_pool(wasi_ctx); addr_pool = wasi_ctx_get_addr_pool(wasi_ctx);
@ -1641,6 +1663,9 @@ wasi_sock_open(wasm_exec_env_t exec_env, wasi_fd_t poolfd,
if (!wasi_ctx) if (!wasi_ctx)
return __WASI_EACCES; return __WASI_EACCES;
if (!validate_native_addr(sockfd, sizeof(*sockfd)))
return __WASI_EINVAL;
curfds = wasi_ctx_get_curfds(wasi_ctx); curfds = wasi_ctx_get_curfds(wasi_ctx);
return wasi_ssp_sock_open(exec_env, curfds, poolfd, af, socktype, sockfd); return wasi_ssp_sock_open(exec_env, curfds, poolfd, af, socktype, sockfd);
@ -2080,6 +2105,10 @@ wasi_sock_recv_from(wasm_exec_env_t exec_env, wasi_fd_t sock,
return __WASI_EINVAL; return __WASI_EINVAL;
} }
/* note: src_addr is NULL when called by wasi_sock_recv */
if (src_addr != NULL && !validate_native_addr(src_addr, sizeof(*src_addr)))
return __WASI_EINVAL;
if (!validate_native_addr(ro_data_len, (uint64)sizeof(uint32))) if (!validate_native_addr(ro_data_len, (uint64)sizeof(uint32)))
return __WASI_EINVAL; return __WASI_EINVAL;
@ -2118,6 +2147,9 @@ wasi_sock_recv(wasm_exec_env_t exec_env, wasi_fd_t sock, iovec_app_t *ri_data,
wasm_module_inst_t module_inst = get_module_inst(exec_env); wasm_module_inst_t module_inst = get_module_inst(exec_env);
wasi_errno_t error; wasi_errno_t error;
if (!validate_native_addr(ro_data_len, sizeof(*ro_data_len)))
return __WASI_EINVAL;
if (!validate_native_addr(ro_flags, (uint64)sizeof(wasi_roflags_t))) if (!validate_native_addr(ro_flags, (uint64)sizeof(wasi_roflags_t)))
return __WASI_EINVAL; return __WASI_EINVAL;
@ -2227,6 +2259,9 @@ wasi_sock_send_to(wasm_exec_env_t exec_env, wasi_fd_t sock,
return __WASI_EINVAL; return __WASI_EINVAL;
} }
if (!validate_native_addr((void *)dest_addr, sizeof(*dest_addr)))
return __WASI_EINVAL;
if (!validate_native_addr(so_data_len, (uint64)sizeof(uint32))) if (!validate_native_addr(so_data_len, (uint64)sizeof(uint32)))
return __WASI_EINVAL; return __WASI_EINVAL;