1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stack pointer corruption in setjmp handler in WASI builds

Browse Source
This commit is contained in:
刘皓 2025-03-27 00:34:27 -04:00 committed by Yuta Saito
parent dea505dea0
commit 72fc9c7b15
Notes: git 2025-03-31 02:59:51 +00:00 
Merged: https://github.com/ruby/ruby/pull/12995
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wasm/setjmp.c
View File

@ -143,9 +143,11 @@ rb_wasm_try_catch_init(struct rb_wasm_try_catch *try_catch,
try_catch->try_f = try_f; try_catch->try_f = try_f;
try_catch->catch_f = catch_f; try_catch->catch_f = catch_f;
try_catch->context = context; try_catch->context = context;
try_catch->stack_pointer = NULL;
} }
// NOTE: This function is not processed by Asyncify due to a call of asyncify_stop_rewind // NOTE: This function is not processed by Asyncify due to a call of asyncify_stop_rewind
__attribute__((noinline))
void void
rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf *target) rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf *target)
{ {
@ -154,6 +156,10 @@ rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf
target->state = JMP_BUF_STATE_CAPTURED; target->state = JMP_BUF_STATE_CAPTURED;
if (try_catch->stack_pointer == NULL) {
try_catch->stack_pointer = rb_wasm_get_stack_pointer();
}
switch ((enum try_catch_phase)try_catch->state) { switch ((enum try_catch_phase)try_catch->state) {
case TRY_CATCH_PHASE_MAIN: case TRY_CATCH_PHASE_MAIN:
// may unwind // may unwind
@ -175,6 +181,8 @@ rb_wasm_try_catch_loop_run(struct rb_wasm_try_catch *try_catch, rb_wasm_jmp_buf
// stop unwinding // stop unwinding
// (but call stop_rewind to update the asyncify state to "normal" from "unwind") // (but call stop_rewind to update the asyncify state to "normal" from "unwind")
asyncify_stop_rewind(); asyncify_stop_rewind();
// reset the stack pointer to what it was before the most recent call to try_f or catch_f
rb_wasm_set_stack_pointer(try_catch->stack_pointer);
// clear the active jmpbuf because it's already stopped // clear the active jmpbuf because it's already stopped
_rb_wasm_active_jmpbuf = NULL; _rb_wasm_active_jmpbuf = NULL;
// reset jmpbuf state to be able to unwind again // reset jmpbuf state to be able to unwind again

1
wasm/setjmp.h
View File

@ -65,6 +65,7 @@ struct rb_wasm_try_catch {
rb_wasm_try_catch_func_t try_f; rb_wasm_try_catch_func_t try_f;
rb_wasm_try_catch_func_t catch_f; rb_wasm_try_catch_func_t catch_f;
void *context; void *context;
void *stack_pointer;
int state; int state;
}; };