Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RTL][KMTEST] RtlPcToFileHeader doesn't handle user mode images in kernel mode

Browse source
This commit is contained in:
Timo Kreuzer 2018-05-10 21:37:30 +02:00
parent 3cf2bea0de
commit 20c1da7963
2 changed files with 73 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
modules/rostests/kmtests/rtl/RtlStack.c
View file

@ -130,7 +130,71 @@ TestStackWalk1(VOID)
TestStackWalk2();
}
#ifdef _M_AMD64
NTSYSAPI
PVOID
NTAPI
RtlPcToFileHeader(
_In_ PVOID PcValue,
_Out_ PVOID *BaseOfImage);
extern char __ImageBase;
DECLSPEC_NOINLINE
static
VOID
TestRtlPcToFileHeader(VOID)
{
PVOID ImageBase, Result;
PTEB Teb;
PPEB Peb;
/* First test a function from this image */
Result = RtlPcToFileHeader(&TestRtlPcToFileHeader, &ImageBase);
ok_eq_pointer(Result, ImageBase);
ok_eq_pointer(ImageBase, &__ImageBase);
#ifdef NTOS_MODE_USER
Teb = NtCurrentTeb();
#else
Teb = KeGetCurrentThread()->Teb;
#endif
ok(Teb != NULL, "Teb is NULL!\n");
if (Teb == NULL)
{
return;
}
_SEH2_TRY
{
Peb = Teb->ProcessEnvironmentBlock;
ok(Peb != NULL, "Peb is NULL!\n");
if (Peb == NULL)
{
return;
}
/* Test an address somewhere within the main image of the current process */
Result = RtlPcToFileHeader((PUCHAR)Peb->ImageBaseAddress + 0x1000, &ImageBase);
ok_eq_pointer(Result, ImageBase);
#ifdef NTOS_MODE_USER
ok_eq_pointer(ImageBase, Peb->ImageBaseAddress);
#else
ok_eq_pointer(ImageBase, NULL);
#endif
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
ok(FALSE, "Got an exception!\n");
}
_SEH2_END
}
#endif // _M_AMD64
START_TEST(RtlStack)
{
TestStackWalk1();
#ifdef _M_AMD64
TestRtlPcToFileHeader();
#endif // _M_AMD64
}

11
ntoskrnl/rtl/libsupp.c
View file

@ -37,17 +37,24 @@ RtlPcToFileHeader(
{
PLDR_DATA_TABLE_ENTRY LdrEntry;
BOOLEAN InSystem;
KIRQL OldIrql;
/* Get the base for this file */
if ((ULONG_PTR)PcValue > (ULONG_PTR)MmHighestUserAddress)
{
/* Acquire the loaded module spinlock */
KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql);
/* We are in kernel */
*BaseOfImage = KiPcToFileHeader(PcValue, &LdrEntry, FALSE, &InSystem);
/* Release lock */
KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);
}
else
{
/* We are in user land */
*BaseOfImage = KiRosPcToUserFileHeader(PcValue, &LdrEntry);
/* User mode is not handled here! */
*BaseOfImage = NULL;
}
return *BaseOfImage;