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

[RTL/x64] Improve RtlWalkFrameChain to handle user mode

Browse source
This commit is contained in:
Timo Kreuzer 2024-07-13 07:59:44 +03:00
parent f482244f45
commit ca0fa4af1e
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sdk/lib/rtl/amd64/unwind.c
View file

@ -943,6 +943,7 @@ RtlWalkFrameChain(OUT PVOID *Callers,
PVOID HandlerData; PVOID HandlerData;
ULONG i, FramesToSkip; ULONG i, FramesToSkip;
PRUNTIME_FUNCTION FunctionEntry; PRUNTIME_FUNCTION FunctionEntry;
MODE CurrentMode = RtlpGetMode();
DPRINT("Enter RtlWalkFrameChain\n"); DPRINT("Enter RtlWalkFrameChain\n");
@ -956,11 +957,6 @@ RtlWalkFrameChain(OUT PVOID *Callers,
/* Get the stack limits */ /* Get the stack limits */
RtlpGetStackLimits(&StackLow, &StackHigh); RtlpGetStackLimits(&StackLow, &StackHigh);
/* Check if we want the user-mode stack frame */
if (Flags & 1)
{
}
_SEH2_TRY _SEH2_TRY
{ {
/* Loop the frames */ /* Loop the frames */
@ -990,15 +986,26 @@ RtlWalkFrameChain(OUT PVOID *Callers,
} }
/* Check if we are in kernel mode */ /* Check if we are in kernel mode */
if (RtlpGetMode() == KernelMode) if (CurrentMode == KernelMode)
{ {
/* Check if we left the kernel range */ /* Check if we left the kernel range */
if (!(Flags & 1) && (Context.Rip < 0xFFFF800000000000ULL)) if (Context.Rip < 0xFFFF800000000000ULL)
{
/* Bail out, unless user mode was requested */
if ((Flags & 1) == 0)
{ {
break; break;
} }
/* We are in user mode now, get UM stack bounds */
CurrentMode = UserMode;
StackLow = (ULONG64)NtCurrentTeb()->NtTib.StackLimit;
StackHigh = (ULONG64)NtCurrentTeb()->NtTib.StackBase;
} }
else }
/* Check (again) if we are in user mode now */
if (CurrentMode == UserMode)
{ {
/* Check if we left the user range */ /* Check if we left the user range */
if ((Context.Rip < 0x10000) || if ((Context.Rip < 0x10000) ||