[PATCH 0/1] MR7268: ntdll: Fix syscall_cfa offset in user_mode_abort_thread.

[Jinoh Kang (＠iamahuman)]

Otherwise sending ^C to a running ARM64 process crashes it randomly.

Note that 0x110 is prev_frame, the field that immediately precedes
syscall_cfa.

Fixes: ca79629b3e436c8799281319dd313249bf05b9b5

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7268

[PATCH 1/1] ntdll: Fix syscall_cfa offset in user_mode_abort_thread.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

Otherwise sending ^C to a running ARM64 process crashes it randomly.

Note that 0x110 is prev_frame, the field that immediately precedes
syscall_cfa.

Fixes: ca79629b3e436c8799281319dd313249bf05b9b5
---
 dlls/ntdll/unix/signal_arm64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index 57d9c375076..4d5b905fea4 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -955,7 +955,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return,
  */
 extern void DECLSPEC_NORETURN user_mode_abort_thread( NTSTATUS status, struct syscall_frame *frame );
 __ASM_GLOBAL_FUNC( user_mode_abort_thread,
-                   "ldr x1, [x1, #0x110]\n\t"    /* frame->syscall_cfa */
+                   "ldr x1, [x1, #0x118]\n\t"    /* frame->syscall_cfa */
                    "sub x29, x1, #0xc0\n\t"
                    /* switch to kernel stack */
                    "mov sp, x29\n\t"
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7268