christoph/wamr
1
Fork 0
Code Releases Activity

Fix exec_env_tls assertion in module instantiation (#3844)

Browse Source 
The execute_post_instantiate_functions may be triggered by wasm_cluster_spawn_exec_env,
in which the exec_env_tls can be NULL and cause the assertion invalid.

p.s. https://github.com/bytecodealliance/wasm-micro-runtime/issues/3839.
This commit is contained in:
Wenyong Huang
2024-10-08 10:08:29 +08:00
committed by GitHub
parent 30539bf50c
commit deacb7a8d8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/iwasm/aot/aot_runtime.c
View File

@ -1560,8 +1560,12 @@ execute_post_instantiate_functions(AOTModuleInstance *module_inst,
if (is_sub_inst) { if (is_sub_inst) {
bh_assert(exec_env_main); bh_assert(exec_env_main);
#ifdef OS_ENABLE_HW_BOUND_CHECK #ifdef OS_ENABLE_HW_BOUND_CHECK
bh_assert(exec_env_tls == exec_env_main); /* May come from pthread_create_wrapper, thread_spawn_wrapper and
(void)exec_env_tls; wasm_cluster_spawn_exec_env. If it comes from the former two,
the exec_env_tls must be not NULL and equal to exec_env_main,
else if it comes from the last one, it may be NULL. */
if (exec_env_tls)
bh_assert(exec_env_tls == exec_env_main);
#endif #endif
exec_env = exec_env_main; exec_env = exec_env_main;

8
core/iwasm/interpreter/wasm_runtime.c
View File

@ -1594,8 +1594,12 @@ execute_post_instantiate_functions(WASMModuleInstance *module_inst,
if (is_sub_inst) { if (is_sub_inst) {
bh_assert(exec_env_main); bh_assert(exec_env_main);
#ifdef OS_ENABLE_HW_BOUND_CHECK #ifdef OS_ENABLE_HW_BOUND_CHECK
bh_assert(exec_env_tls == exec_env_main); /* May come from pthread_create_wrapper, thread_spawn_wrapper and
(void)exec_env_tls; wasm_cluster_spawn_exec_env. If it comes from the former two,
the exec_env_tls must be not NULL and equal to exec_env_main,
else if it comes from the last one, it may be NULL. */
if (exec_env_tls)
bh_assert(exec_env_tls == exec_env_main);
#endif #endif
exec_env = exec_env_main; exec_env = exec_env_main;