gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2026-01-14 05:16:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: clear exec_env_tls when destroying exec_env

Browse Source 
When an exec_env is destroyed, check if it matches the current thread's
exec_env_tls and clear it to avoid dangling pointer issues.

Without this fix, in daemon-style execution where the same thread runs
multiple WASM modules sequentially (like Cloudflare Workers), the
exec_env_tls can point to freed memory after an exec_env is destroyed,
causing crashes on subsequent executions when the signal handler tries
to access it.

This is critical for AOT mode with hardware bounds checking enabled,
where signal handlers rely on exec_env_tls to handle SIGSEGV properly.
This commit is contained in:
teamchong 2025-12-29 13:13:12 -05:00
parent 2a2dd19f32
commit 628d4110a4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/iwasm/common/wasm_exec_env.c
View File

@ -199,6 +199,20 @@ wasm_exec_env_create(struct WASMModuleInstanceCommon *module_inst,
void
wasm_exec_env_destroy(WASMExecEnv *exec_env)
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
/*
* Clear exec_env_tls if it points to this exec_env to avoid dangling
* pointer after destruction. This is critical for daemon-style execution
* where the same thread runs multiple WASM modules sequentially.
* Without this, the signal handler may access freed memory on subsequent
* executions, causing crashes.
*/
WASMExecEnv *current_tls = wasm_runtime_get_exec_env_tls();
if (current_tls == exec_env) {
wasm_runtime_set_exec_env_tls(NULL);
}
#endif
#if WASM_ENABLE_THREAD_MGR != 0
/* Wait for all sub-threads */
WASMCluster *cluster = wasm_exec_env_get_cluster(exec_env);