[PATCH 1/2] ntdll: Use 32-bit stack in alloc_fs_sel().
Brendan Shanks
wine at gitlab.winehq.org
Tue May 17 16:39:57 CDT 2022
From: Brendan Shanks <bshanks at codeweavers.com>
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
---
dlls/ntdll/unix/signal_x86_64.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 34334f72ff0..b3657644b9c 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -93,8 +93,12 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel,
/* switch to 32-bit stack */
"pushq %rbx\n\t"
"pushq %rdi\n\t"
+ "pushq %r12\n\t"
+ "pushq %r13\n\t"
"movq %rsp,%rdi\n\t"
- "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */
+ "movq %gs:0x30,%r12\n\t" /* NtCurrentTeb()->Tib.Self */
+ "movsxd 0x180c(%r12),%r13\n\t" /* NtCurrentTeb()->WowTebOffset */
+ "movq 0x04(%r12,%r13),%rsp\n\t" /* Wow Tib.StackBase */
"subl $0x10,%esp\n\t"
/* setup modify_ldt struct on 32-bit stack */
"movl %ecx,(%rsp)\n\t" /* entry_number */
@@ -108,6 +112,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel,
/* restore stack */
"movl (%rsp),%eax\n\t" /* entry_number */
"movq %rdi,%rsp\n\t"
+ "popq %r13\n\t"
+ "popq %r12\n\t"
"popq %rdi\n\t"
"popq %rbx\n\t"
"ret" );
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/85
More information about the wine-devel
mailing list