Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-05 09:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:KE:X64] Fix bugs in KeContextToTrapFrame and KeTrapFrameToContext

Browse source 
Set valid EFlags, the non-volatiles need to be taken from the exception frame, because the ones from the trap frame might not be set.
This commit is contained in:
Timo Kreuzer 2018-02-12 19:21:50 +01:00
parent a662c6f180
commit fe6752f852
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ntoskrnl/ke/amd64/context.c
View file

@ -56,8 +56,7 @@ KeContextToTrapFrame(IN PCONTEXT Context,
} }
/* Handle floating point registers */ /* Handle floating point registers */
if ((ContextFlags & CONTEXT_FLOATING_POINT) && if ((ContextFlags & CONTEXT_FLOATING_POINT))
((Context->SegCs & MODE_MASK) != KernelMode))
{ {
TrapFrame->MxCsr = Context->MxCsr; TrapFrame->MxCsr = Context->MxCsr;
TrapFrame->Xmm0 = Context->Xmm0; TrapFrame->Xmm0 = Context->Xmm0;
@ -84,24 +83,35 @@ KeContextToTrapFrame(IN PCONTEXT Context,
/* Handle control registers */ /* Handle control registers */
if (ContextFlags & CONTEXT_CONTROL) if (ContextFlags & CONTEXT_CONTROL)
{ {
/* Check if this was a Kernel Trap */ /* RIP, RSP, EFLAGS */
TrapFrame->Rip = Context->Rip;
TrapFrame->Rsp = Context->Rsp;
TrapFrame->EFlags = Context->EFlags;
if ((Context->SegCs & MODE_MASK) == KernelMode) if ((Context->SegCs & MODE_MASK) == KernelMode)
{ {
/* Set valid selectors */ /* Set valid selectors */
TrapFrame->SegCs = KGDT64_R0_CODE; TrapFrame->SegCs = KGDT64_R0_CODE;
TrapFrame->SegSs = KGDT64_R0_DATA; TrapFrame->SegSs = KGDT64_R0_DATA;
/* Set valid EFLAGS */
TrapFrame->EFlags &= (EFLAGS_USER_SANITIZE | EFLAGS_INTERRUPT_MASK);
} }
else else
{ {
/* Copy selectors */ /* Copy selectors */
TrapFrame->SegCs = Context->SegCs; TrapFrame->SegCs = Context->SegCs;
TrapFrame->SegSs = Context->SegSs; if (TrapFrame->SegCs != (KGDT64_R3_CODE | RPL_MASK))
} {
TrapFrame->SegCs = (KGDT64_R3_CMCODE | RPL_MASK);
}
/* RIP, RSP, EFLAGS */ TrapFrame->SegSs = Context->SegSs;
TrapFrame->Rip = Context->Rip;
TrapFrame->Rsp = Context->Rsp; /* Set valid EFLAGS */
TrapFrame->EFlags = Context->EFlags; TrapFrame->EFlags &= EFLAGS_USER_SANITIZE;
TrapFrame->EFlags |= EFLAGS_INTERRUPT_MASK;
}
} }
/* Handle segment selectors */ /* Handle segment selectors */
@ -136,6 +146,18 @@ KeContextToTrapFrame(IN PCONTEXT Context,
TrapFrame->Dr3 = Context->Dr3; TrapFrame->Dr3 = Context->Dr3;
TrapFrame->Dr6 = Context->Dr6; TrapFrame->Dr6 = Context->Dr6;
TrapFrame->Dr7 = Context->Dr7; TrapFrame->Dr7 = Context->Dr7;
if ((Context->SegCs & MODE_MASK) != KernelMode)
{
if (TrapFrame->Dr0 > (ULONG64)MmHighestUserAddress)
TrapFrame->Dr0 = 0;
if (TrapFrame->Dr1 > (ULONG64)MmHighestUserAddress)
TrapFrame->Dr1 = 0;
if (TrapFrame->Dr2 > (ULONG64)MmHighestUserAddress)
TrapFrame->Dr2 = 0;
if (TrapFrame->Dr3 > (ULONG64)MmHighestUserAddress)
TrapFrame->Dr3 = 0;
}
} }
/* Restore IRQL */ /* Restore IRQL */
@ -164,11 +186,8 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame,
if (ContextFlags & CONTEXT_INTEGER) if (ContextFlags & CONTEXT_INTEGER)
{ {
Context->Rax = TrapFrame->Rax; Context->Rax = TrapFrame->Rax;
Context->Rbx = TrapFrame->Rbx;
Context->Rcx = TrapFrame->Rcx; Context->Rcx = TrapFrame->Rcx;
Context->Rdx = TrapFrame->Rdx; Context->Rdx = TrapFrame->Rdx;
Context->Rsi = TrapFrame->Rsi;
Context->Rdi = TrapFrame->Rdi;
Context->Rbp = TrapFrame->Rbp; Context->Rbp = TrapFrame->Rbp;
Context->R8 = TrapFrame->R8; Context->R8 = TrapFrame->R8;
Context->R9 = TrapFrame->R9; Context->R9 = TrapFrame->R9;
@ -177,6 +196,9 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame,
if (ExceptionFrame) if (ExceptionFrame)
{ {
Context->Rbx = ExceptionFrame->Rbx;
Context->Rsi = ExceptionFrame->Rsi;
Context->Rdi = ExceptionFrame->Rdi;
Context->R12 = ExceptionFrame->R12; Context->R12 = ExceptionFrame->R12;
Context->R13 = ExceptionFrame->R13; Context->R13 = ExceptionFrame->R13;
Context->R14 = ExceptionFrame->R14; Context->R14 = ExceptionFrame->R14;