gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-03-12 00:45:28 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix possible data race in thread manager (#1973)

Browse Source 
Destroy child thread's exec_env before destroying its module instance and
add the process into cluster's lock to avoid possible data race: if exec_env
is removed from custer's exec_env_list and destroyed later, the main thread
may not wait it and start to destroy the wasm runtime, and the destroying
of the sub thread's exec_env may free or overread/written an destroyed or
re-initialized resource.

And fix an issue in wasm_cluster_cancel_thread.
This commit is contained in:
Wenyong Huang 2023-02-20 17:11:21 +08:00 committed by GitHub
parent 739acfc908
commit e516de8ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,14 +545,18 @@ wasm_cluster_destroy_spawned_exec_env(WASMExecEnv *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);
/* Free aux stack space */
os_mutex_lock(&cluster->lock); os_mutex_lock(&cluster->lock);
free_aux_stack(exec_env, exec_env->aux_stack_bottom.bottom);
wasm_cluster_del_exec_env(cluster, exec_env);
os_mutex_unlock(&cluster->lock);
wasm_exec_env_destroy_internal(exec_env);
/* Free aux stack space */
free_aux_stack(exec_env, exec_env->aux_stack_bottom.bottom);
/* Remove exec_env */
wasm_cluster_del_exec_env(cluster, exec_env);
/* Destroy exec_env */
wasm_exec_env_destroy_internal(exec_env);
/* Routine exit, destroy instance */
wasm_runtime_deinstantiate_internal(module_inst, true); wasm_runtime_deinstantiate_internal(module_inst, true);
os_mutex_unlock(&cluster->lock);
} }
/* start routine of thread manager */ /* start routine of thread manager */
@ -585,16 +589,17 @@ thread_manager_start_routine(void *arg)
#endif #endif
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, exec_env->aux_stack_bottom.bottom);
/* routine exit, destroy instance */ /* Remove exec_env */
wasm_runtime_deinstantiate_internal(module_inst, true);
/* Remove and exec_env */
wasm_cluster_del_exec_env(cluster, exec_env); wasm_cluster_del_exec_env(cluster, exec_env);
os_mutex_unlock(&cluster->lock); /* Destroy exec_env */
/* destroy exec_env */
wasm_exec_env_destroy_internal(exec_env); wasm_exec_env_destroy_internal(exec_env);
/* Routine exit, destroy instance */
wasm_runtime_deinstantiate_internal(module_inst, true);
os_mutex_unlock(&cluster->lock);
os_thread_exit(ret); os_thread_exit(ret);
return ret; return ret;
@ -909,13 +914,19 @@ wasm_cluster_exit_thread(WASMExecEnv *exec_env, void *retval)
/* App exit the thread, free the resources before exit native thread */ /* App exit the thread, free the resources before exit native thread */
/* Detach the native thread here to ensure the resources are freed */ /* Detach the native thread here to ensure the resources are freed */
wasm_cluster_detach_thread(exec_env); wasm_cluster_detach_thread(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, exec_env->aux_stack_bottom.bottom);
/* Remove and destroy exec_env */ /* Remove exec_env */
wasm_cluster_del_exec_env(cluster, exec_env); wasm_cluster_del_exec_env(cluster, exec_env);
os_mutex_unlock(&cluster->lock); /* Destroy exec_env */
wasm_exec_env_destroy_internal(exec_env); wasm_exec_env_destroy_internal(exec_env);
/* Routine exit, destroy instance */
wasm_runtime_deinstantiate_internal(exec_env->module_inst, true);
os_mutex_unlock(&cluster->lock);
os_thread_exit(retval); os_thread_exit(retval);
} }
@ -935,11 +946,14 @@ int32
wasm_cluster_cancel_thread(WASMExecEnv *exec_env) wasm_cluster_cancel_thread(WASMExecEnv *exec_env)
{ {
os_mutex_lock(&cluster_list_lock); os_mutex_lock(&cluster_list_lock);
os_mutex_lock(&exec_env->cluster->lock);
if (!exec_env->cluster) { if (!exec_env->cluster) {
goto final; os_mutex_unlock(&cluster_list_lock);
return 0;
} }
os_mutex_lock(&exec_env->cluster->lock);
if (!clusters_have_exec_env(exec_env)) { if (!clusters_have_exec_env(exec_env)) {
/* Invalid thread or the thread has exited */ /* Invalid thread or the thread has exited */
goto final; goto final;