Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:KE/x64] Fix handling of PCR::UserRsp

Browse source 
This is a temporary helper for the system call entry point to store the user mode stack, before switching to the kernel mode stack. Initially it was copied to the trap frame inside KiSystemCallHandler. This has been moved to the system call entry point, but some remnants remained. The problem is that KiSystemCallHandler can be called twice in a system call (when the call is the first GUI call and the stack needs to be extended). In that scenario, when the thread was preempted, a new value could be saved in the PCR before running KiSystemCallHandler again, and then overwriting the proper value with a bogus one from a different thread. This rarely seemed to happen on UP, but happens a lot with SMP.
This commit is contained in:
Timo Kreuzer 2024-12-12 14:44:05 +02:00
parent 5df3a0bb4a
commit 91948dea80
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ntoskrnl/ke/amd64/traphandler.c
View file

@ -159,9 +159,8 @@ KiSystemCallHandler(
/* We don't have an exception frame yet */ /* We don't have an exception frame yet */
TrapFrame->ExceptionFrame = 0; TrapFrame->ExceptionFrame = 0;
/* Before enabling interrupts get the user rsp from the KPCR */ /* Get the user Stack pointer */
UserRsp = __readgsqword(FIELD_OFFSET(KIPCR, UserRsp)); UserRsp = TrapFrame->Rsp;
TrapFrame->Rsp = UserRsp;
/* Enable interrupts */ /* Enable interrupts */
_enable(); _enable();

3
ntoskrnl/ke/amd64/usercall.c
View file

@ -318,9 +318,6 @@ KeUserModeCallback(
/* Restore stack and return */ /* Restore stack and return */
*UserStackPointer = OldStack; *UserStackPointer = OldStack;
#ifdef _M_AMD64 // could probably move the update to TrapFrame->Rsp from the C handler to the asm code
__writegsqword(FIELD_OFFSET(KIPCR, UserRsp), OldStack);
#endif
return CallbackStatus; return CallbackStatus;
} }