Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-01 03:45:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL/x64] Fix a bug in RtlpUnwindInternal

Browse source 
Check if the stack pointer is out of bounds, before trying to unwind a frame. This will not fix any crashes, but it prevents simple crashes from going into a recursive exception.
This commit is contained in:
Timo Kreuzer 2025-01-31 11:30:50 +02:00
parent 160bc8a0ce
commit daf557b245
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,6 +649,18 @@ Exit:
return NULL; return NULL;
} }
static __inline
BOOL
RtlpIsStackPointerValid(
_In_ ULONG64 StackPointer,
_In_ ULONG64 LowLimit,
_In_ ULONG64 HighLimit)
{
return (StackPointer >= LowLimit) &&
(StackPointer < HighLimit) &&
((StackPointer & 7) == 0);
}
/*! /*!
\remark The implementation is based on the description in this blog: http://www.nynaeve.net/?p=106 \remark The implementation is based on the description in this blog: http://www.nynaeve.net/?p=106
@ -699,6 +711,11 @@ RtlpUnwindInternal(
/* Start looping */ /* Start looping */
while (TRUE) while (TRUE)
{ {
if (!RtlpIsStackPointerValid(UnwindContext.Rsp, StackLow, StackHigh))
{
return FALSE;
}
/* Lookup the FunctionEntry for the current RIP */ /* Lookup the FunctionEntry for the current RIP */
FunctionEntry = RtlLookupFunctionEntry(UnwindContext.Rip, &ImageBase, NULL); FunctionEntry = RtlLookupFunctionEntry(UnwindContext.Rip, &ImageBase, NULL);
if (FunctionEntry == NULL) if (FunctionEntry == NULL)