Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 12:39:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:KE] Fix stack alignment issues

Browse source
This commit is contained in:
Timo Kreuzer 2018-03-21 10:33:31 +01:00
parent 2a2d0903bf
commit 69e8cb635a
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ntoskrnl/ke/amd64/trap.S
View file

@ -600,7 +600,19 @@ PUBLIC KiApcInterrupt
ExitTrap (TF_VOLATILES or TF_IRQL) ExitTrap (TF_VOLATILES or TF_IRQL)
.ENDP .ENDP
/*
* VOID
* KiRetireDpcList(
* PKPRCB Prcb);
*/
EXTERN KiRetireDpcList:PROC EXTERN KiRetireDpcList:PROC
/*
* VOID
* KiRetireDpcListInDpcStack(
* PKPRCB Prcb,
* PVOID DpcStack);
*/
PUBLIC KiRetireDpcListInDpcStack PUBLIC KiRetireDpcListInDpcStack
.PROC KiRetireDpcListInDpcStack .PROC KiRetireDpcListInDpcStack
push rbp push rbp
@ -609,9 +621,13 @@ PUBLIC KiRetireDpcListInDpcStack
.setframe rbp, 0 .setframe rbp, 0
.endprolog .endprolog
/* Switch stack and call the function */ /* Switch to the DpcStack */
mov rsp, rdx mov rsp, rdx
sub rsp, 40
/* The stack is 16 byte aligned, allocate 32 bytes home space */
sub rsp, 32
/* Call KiRetireDpcList on the given stack */
call KiRetireDpcList call KiRetireDpcList
/* Restore stack, cleanup and return */ /* Restore stack, cleanup and return */

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

@ -66,7 +66,7 @@ KiInitializeUserApc(
_SEH2_TRY _SEH2_TRY
{ {
/* Probe the context */ /* Probe the context */
ProbeForWrite(Context, sizeof(CONTEXT), 16); ProbeForWrite(Context, sizeof(CONTEXT), 16);
/* Convert the current trap frame to a context */ /* Convert the current trap frame to a context */
Context->ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; Context->ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;
@ -253,8 +253,11 @@ KeUserModeCallback(
/* Enter a SEH Block */ /* Enter a SEH Block */
_SEH2_TRY _SEH2_TRY
{ {
/* Calculate and align the stack size */ /* Calculate and align the stack. This is unaligned by 8 bytes, since the following
UserArguments = (PUCHAR)ALIGN_DOWN_POINTER_BY(OldStack - ArgumentLength, sizeof(PVOID)); UCALLOUT_FRAME compensates for that and on entry we already have a full stack
frame with home space for the next call, i.e. we are already inside the function
body and the stack needs to be 16 byte aligned. */
UserArguments = (PUCHAR)ALIGN_DOWN_POINTER_BY(OldStack - ArgumentLength, 16) - 8;
/* The callout frame is below the arguments */ /* The callout frame is below the arguments */
CalloutFrame = ((PUCALLOUT_FRAME)UserArguments) - 1; CalloutFrame = ((PUCALLOUT_FRAME)UserArguments) - 1;