Skip to content

fix: use-after-free in cabi_realloc free_list on repeated export calls #319

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
chaynabors wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use-after-free in cabi_realloc free_list on repeated export calls #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions embedding/embedding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ cabi_realloc_adapter(void *ptr, size_t orig_size, size_t org_align,
__attribute__((export_name("cabi_realloc"))) void *
cabi_realloc(void *ptr, size_t orig_size, size_t org_align, size_t new_size) {
void *ret = JS_realloc(Runtime.cx, ptr, orig_size, new_size);
// track all allocations during a function "call" for freeing
Runtime.free_list.push_back(ret);
if (!ret) {
Runtime.engine->abort("(cabi_realloc) Unable to realloc");
}
Expand Down Expand Up @@ -233,6 +231,7 @@ __attribute__((export_name("call"))) uint32_t call(uint32_t fn_idx,
if (fn->retptr) {
LOG("(call) setting retptr at arg %d\n", argcnt);
retptr = cabi_realloc(nullptr, 0, 4, fn->retsize);
Runtime.free_list.push_back(retptr);
args[argcnt].setInt32((uint32_t)retptr);
}

Expand Down Expand Up @@ -295,6 +294,7 @@ __attribute__((export_name("call"))) uint32_t call(uint32_t fn_idx,
if (!fn->retptr && fn->ret.has_value()) {
LOG("(call) singular return");
retptr = cabi_realloc(0, 0, 4, fn->retsize);
Runtime.free_list.push_back(retptr);
switch (fn->ret.value()) {
case CoreVal::I32:
*((uint32_t *)retptr) = ret.toInt32();
Expand Down