Skip to content

Ensure --addr-pool mask accepts numbers only #4619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+27 −3
Open

Ensure --addr-pool mask accepts numbers only #4619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e99b35
Ensure --addr-pool mask accepts numbers only
linear0211 Sep 11, 2025
02f59f1
Add mask validation
linear0211 Sep 12, 2025
7c13440
Apply suggestions from code review
linear0211 Oct 13, 2025
c8a2956
Replace mask assignment position
linear0211 Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions core/iwasm/common/wasm_runtime_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,7 +3812,8 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,

/* addr_pool(textual) -> apool */
for (i = 0; i < addr_pool_size; i++) {
char *cp, *address, *mask;
char *cp, *address, *mask, *endptr;
long mask_val;
bool ret = false;

cp = bh_strdup(addr_pool[i]);
Expand All @@ -3833,7 +3834,21 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,
goto fail;
}

ret = addr_pool_insert(apool, address, (uint8)atoi(mask));
errno = 0;
mask_val = strtol(mask, &endptr, 10);

if (mask == endptr || *endptr != '\0') {
snprintf(error_buf, error_buf_size,
"Invalid address pool entry: mask must be a number");
goto fail;
}
if (errno != 0 || mask_val < 0) {
snprintf(error_buf, error_buf_size,
"Init wasi environment failed: invalid mask number");
goto fail;
}

ret = addr_pool_insert(apool, address, (uint8)mask_val);
wasm_runtime_free(cp);
if (!ret) {
set_error_buf(error_buf, error_buf_size,
Expand Down
11 changes: 10 additions & 1 deletion core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3105,7 +3105,6 @@ addr_pool_insert(struct addr_pool *addr_pool, const char *addr, uint8 mask)
}

next->next = NULL;
next->mask = mask;

if (os_socket_inet_network(true, addr, &target) != BHT_OK) {
// If parsing IPv4 fails, try IPv6
Expand All @@ -3116,10 +3115,20 @@ addr_pool_insert(struct addr_pool *addr_pool, const char *addr, uint8 mask)
next->type = IPv6;
bh_memcpy_s(next->addr.ip6, sizeof(next->addr.ip6), target.ipv6,
sizeof(target.ipv6));
if (mask > 128) {
wasm_runtime_free(next);
return false;
}
next->mask = mask;
}
else {
next->type = IPv4;
next->addr.ip4 = target.ipv4;
if (mask > 32) {
wasm_runtime_free(next);
return false;
}
next->mask = mask;
}

/* attach with */
Expand Down
Loading