ntdll: Fix arm call_user_exception_dispatcher with kernel stack for syscalls.

This does the same as 23b44e8d, but for arm: Don't call KiUserExceptionDispatcher directly on the stack pointer stored in the CONTEXT, but use the one stored in syscall_frame (which includes the stack allocation in e.g. RtlRaiseException). Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Fix arm call_user_exception_dispatcher with kernel stack for syscalls.
324150c0 · Martin Storsjö · Alexandre Julliard · aa256dee · 324150c0
Commit 324150c0 authored Nov 09, 2021 by Martin Storsjö Committed by Alexandre Julliard Nov 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

signal_arm.c dlls/ntdll/unix/signal_arm.c +4 -0

No files found.
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -563,12 +563,16 @@ void call_raise_user_exception_dispatcher(void)
 NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context )
 {
    struct syscall_frame *frame = arm_thread_data()->syscall_frame;
+    DWORD lr = frame->lr;
+    DWORD sp = frame->sp;
    NTSTATUS status = NtSetContextThread( GetCurrentThread(), context );

    if (status) return status;
    frame->r0 = (DWORD)rec;
    frame->r1 = (DWORD)context;
    frame->pc = (DWORD)pKiUserExceptionDispatcher;
+    frame->lr = lr;
+    frame->sp = sp;
    frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL;
    return status;
 }