Skip to content

fix: Protect mem consumption from null deref #4895

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

fix: Protect mem consumption from null deref #4895

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ samples/workload/include/**

tests/unit/runtime-common/wasm-apps/main.aot
tests/unit/aot-stack-frame/wasm-apps/test_aot.h
.worktrees/
20 changes: 20 additions & 0 deletions core/iwasm/aot/aot_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@ memories_deinstantiate(AOTModuleInstance *module_inst)
}
}
wasm_runtime_free(module_inst->memories);
module_inst->memories = NULL;
}

static AOTMemoryInstance *
Expand Down Expand Up @@ -3795,13 +3796,32 @@ aot_get_module_mem_consumption(const AOTModule *module,
mem_conspn->total_size += mem_conspn->aot_code_size;
}

/**
* Calculate memory consumption of an AOT module instance.
*
* @param module_inst pointer to a fully initialized AOT module instance
* @param mem_conspn output structure to store memory consumption details
*
* @pre module_inst != NULL
* @pre module_inst->module != NULL
* @pre module_inst->e != NULL
* @pre (module_inst->memory_count == 0) || (module_inst->memories != NULL)
*
* In debug builds, these preconditions are validated with bh_assert.
* In release builds, violating preconditions results in undefined behavior.
*/
void
aot_get_module_inst_mem_consumption(const AOTModuleInstance *module_inst,
WASMModuleInstMemConsumption *mem_conspn)
{
AOTTableInstance *tbl_inst;
uint32 i;

bh_assert(module_inst);
bh_assert(module_inst->module);
bh_assert(module_inst->e);
bh_assert(!module_inst->memory_count || module_inst->memories);

memset(mem_conspn, 0, sizeof(*mem_conspn));

mem_conspn->module_inst_struct_size = sizeof(AOTModuleInstance);
Expand Down
23 changes: 22 additions & 1 deletion core/iwasm/interpreter/wasm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3445,9 +3445,11 @@ wasm_deinstantiate(WASMModuleInstance *module_inst, bool is_sub_inst)
(WASMModuleInstanceCommon *)module_inst);
#endif

if (module_inst->memory_count > 0)
if (module_inst->memory_count > 0) {
memories_deinstantiate(module_inst, module_inst->memories,
module_inst->memory_count);
module_inst->memories = NULL;
}

if (module_inst->import_func_ptrs) {
wasm_runtime_free(module_inst->import_func_ptrs);
Expand Down Expand Up @@ -4227,13 +4229,32 @@ wasm_get_module_mem_consumption(const WASMModule *module,
mem_conspn->total_size += mem_conspn->const_strs_size;
}

/**
* Calculate memory consumption of a WASM module instance.
*
* @param module_inst pointer to a fully initialized WASM module instance
* @param mem_conspn output structure to store memory consumption details
*
* @pre module_inst != NULL
* @pre module_inst->module != NULL
* @pre module_inst->e != NULL
* @pre (module_inst->memory_count == 0) || (module_inst->memories != NULL)
*
* In debug builds, these preconditions are validated with bh_assert.
* In release builds, violating preconditions results in undefined behavior.
*/
void
wasm_get_module_inst_mem_consumption(const WASMModuleInstance *module_inst,
WASMModuleInstMemConsumption *mem_conspn)
{
uint32 i;
uint64 size;

bh_assert(module_inst);
bh_assert(module_inst->module);
bh_assert(module_inst->e);
bh_assert(!module_inst->memory_count || module_inst->memories);

memset(mem_conspn, 0, sizeof(*mem_conspn));

mem_conspn->module_inst_struct_size = (uint8 *)module_inst->e
Expand Down
Loading