gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-09 21:26:21 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

wasm_cluster_destroy_spawned_exec_env: Avoid "invalid exec env" trap (#3068)

Browse Source 
Possible alternatives:

* Make wasm_cluster_destroy_spawned_exec_env take two exec_env.
  One for wasm execution and another to specify the target to destroy.

* Make execute functions to switch exec_env as briefly discussed in
  https://github.com/bytecodealliance/wasm-micro-runtime/pull/2047
This commit is contained in:
YAMAMOTO Takashi 2024-01-23 16:20:01 +09:00 committed by GitHub
parent b44aa654b8
commit ab97d543e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/iwasm/libraries/thread-mgr/thread_manager.c
View File

@ -604,11 +604,24 @@ wasm_cluster_destroy_spawned_exec_env(WASMExecEnv *exec_env)
WASMCluster *cluster = wasm_exec_env_get_cluster(exec_env); WASMCluster *cluster = wasm_exec_env_get_cluster(exec_env);
wasm_module_inst_t module_inst = wasm_runtime_get_module_inst(exec_env); wasm_module_inst_t module_inst = wasm_runtime_get_module_inst(exec_env);
bh_assert(cluster != NULL); bh_assert(cluster != NULL);
WASMExecEnv *exec_env_tls = NULL;
#ifdef OS_ENABLE_HW_BOUND_CHECK
/* Note: free_aux_stack can execute the module's "free" function
* using the specified exec_env. In case of OS_ENABLE_HW_BOUND_CHECK,
* it needs to match the TLS exec_env if available. (Consider a native
* function which calls wasm_cluster_destroy_spawned_exec_env.)
*/
exec_env_tls = wasm_runtime_get_exec_env_tls();
#endif
if (exec_env_tls == NULL) {
exec_env_tls = exec_env;
}
os_mutex_lock(&cluster->lock); os_mutex_lock(&cluster->lock);
/* Free aux stack space */ /* Free aux stack space */
free_aux_stack(exec_env, exec_env->aux_stack_bottom.bottom); free_aux_stack(exec_env_tls, exec_env->aux_stack_bottom.bottom);
/* Remove exec_env */ /* Remove exec_env */
wasm_cluster_del_exec_env_internal(cluster, exec_env, false); wasm_cluster_del_exec_env_internal(cluster, exec_env, false);
/* Destroy exec_env */ /* Destroy exec_env */