gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2026-04-18 10:17:38 +00:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix: missing locks in wasm_c_api (#4881)

Browse Source 
- add missing lock in check_loaded_module()
- add missing lock in wasm_module_exports()
- add missing lock in wasm_module_serialize()
This commit is contained in:
liang.he 2026-04-01 19:15:43 -07:00 committed by GitHub
parent bc4d6834cd
commit 4547587f60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/iwasm/common/wasm_c_api.c
View File

@ -2206,12 +2206,15 @@ check_loaded_module(Vector *modules, char *binary_hash)
return NULL; return NULL;
} }
if (!module->ref_count) os_mutex_lock(&module->lock);
/* deleted */ bool is_valid =
continue; (module->ref_count > 0
&& memcmp(module->hash, binary_hash, SHA256_DIGEST_LENGTH) == 0);
os_mutex_unlock(&module->lock);
if (memcmp(module->hash, binary_hash, SHA256_DIGEST_LENGTH) == 0) if (is_valid) {
return module; return module;
}
} }
return NULL; return NULL;
} }
@ -2456,8 +2459,13 @@ wasm_module_imports(const wasm_module_t *module, own wasm_importtype_vec_t *out)
return; return;
} }
if (((const wasm_module_ex_t *)(module))->ref_count == 0) wasm_module_ex_t *module_ex = module_to_module_ext((wasm_module_t *)module);
os_mutex_lock(&module_ex->lock);
if (module_ex->ref_count == 0) {
os_mutex_unlock(&module_ex->lock);
return; return;
}
os_mutex_unlock(&module_ex->lock);
#if WASM_ENABLE_INTERP != 0 #if WASM_ENABLE_INTERP != 0
if ((*module)->module_type == Wasm_Module_Bytecode) { if ((*module)->module_type == Wasm_Module_Bytecode) {
@ -2696,8 +2704,13 @@ wasm_module_exports(const wasm_module_t *module, wasm_exporttype_vec_t *out)
return; return;
} }
if (((const wasm_module_ex_t *)(module))->ref_count == 0) wasm_module_ex_t *module_ex = module_to_module_ext((wasm_module_t *)module);
os_mutex_lock(&module_ex->lock);
if (module_ex->ref_count == 0) {
os_mutex_unlock(&module_ex->lock);
return; return;
}
os_mutex_unlock(&module_ex->lock);
#if WASM_ENABLE_INTERP != 0 #if WASM_ENABLE_INTERP != 0
if ((*module)->module_type == Wasm_Module_Bytecode) { if ((*module)->module_type == Wasm_Module_Bytecode) {
@ -2891,10 +2904,13 @@ wasm_module_serialize(wasm_module_t *module, own wasm_byte_vec_t *out)
if (!module || !out) if (!module || !out)
return; return;
if (((const wasm_module_ex_t *)(module))->ref_count == 0)
return;
module_ex = module_to_module_ext(module); module_ex = module_to_module_ext(module);
os_mutex_lock(&module_ex->lock);
if (module_ex->ref_count == 0) {
os_mutex_unlock(&module_ex->lock);
return;
}
os_mutex_unlock(&module_ex->lock);
comp_ctx = ((WASMModule *)(module_ex->module_comm_rt))->comp_ctx; comp_ctx = ((WASMModule *)(module_ex->module_comm_rt))->comp_ctx;
comp_data = ((WASMModule *)(module_ex->module_comm_rt))->comp_data; comp_data = ((WASMModule *)(module_ex->module_comm_rt))->comp_data;
bh_assert(comp_ctx != NULL && comp_data != NULL); bh_assert(comp_ctx != NULL && comp_data != NULL);