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
linear0211 wants to merge 5 commits into
base: main
Choose a base branch
from
+37 −5
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
29c4d90
Use a thread-safe function and free allocated memory
linear0211 Oct 25, 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
31 changes: 27 additions & 4 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, *nextptr, *endptr;
long mask_val;
bool ret = false;

cp = bh_strdup(addr_pool[i]);
Expand All @@ -3822,18 +3823,40 @@ wasm_runtime_init_wasi(WASMModuleInstanceCommon *module_inst,
goto fail;
}

address = strtok(cp, "/");
mask = strtok(NULL, "/");
#ifdef BH_PLATFORM_WINDOWS
address = strtok_s(cp, "/", &nextptr);
mask = strtok_s(NULL, "/", &nextptr);
#else
address = strtok_r(cp, "/", &nextptr);
mask = strtok_r(NULL, "/", &nextptr);
#endif
Copy link
Collaborator

@yamt yamt Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we can have bh_strtok_r function for this?

Copy link
Collaborator

@lum1n0us lum1n0us Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. However, I think we should use a new PR to implement that and merge it first. Does that sound good to you?

Copy link
Contributor Author

@linear0211 linear0211 Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me. Should I open a new PR for the implementation?


if (!mask) {
snprintf(error_buf, error_buf_size,
"Invalid address pool entry: %s, must be in the format of "
"ADDRESS/MASK",
addr_pool[i]);
wasm_runtime_free(cp);
goto fail;
}

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");
wasm_runtime_free(cp);
goto fail;
}
if (errno != 0 || mask_val < 0) {
snprintf(error_buf, error_buf_size,
"Init wasi environment failed: invalid mask number");
wasm_runtime_free(cp);
goto fail;
}

ret = addr_pool_insert(apool, address, (uint8)atoi(mask));
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