Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-26 07:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL] Properly check for address validity in !poolfind

Browse source
This commit is contained in:
Pierre Schweitzer 2019-01-06 12:58:14 +01:00
parent 47b48520b5
commit 28193399ee
No known key found for this signature in database
GPG key ID: 7545556C3D585B0B
1 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ntoskrnl/mm/ARM3/expool.c
View file

@ -3163,7 +3163,6 @@ ExpKdbgExtPoolFindPagedPool(
ULONG i = 0;
PPOOL_HEADER Entry;
PVOID BaseVa;
PMMPTE PointerPte;
PMMPDE PointerPde;
KdbpPrint("Searching Paged pool (%p : %p) for Tag: %.4s\n", MmPagedPoolStart, MmPagedPoolEnd, (PCHAR)&Tag);
@ -3192,13 +3191,7 @@ ExpKdbgExtPoolFindPagedPool(
}
/* Check if allocation is valid */
PointerPte = MiAddressToPte(BaseVa);
if ((ULONG_PTR)PointerPte > PTE_TOP)
{
break;
}
if (PointerPte->u.Hard.Valid)
if (MmIsAddressValid(BaseVa))
{
for (Entry = BaseVa;
(ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE;
@ -3243,7 +3236,6 @@ ExpKdbgExtPoolFindNonPagedPool(
{
PPOOL_HEADER Entry;
PVOID BaseVa;
PMMPTE PointerPte;
KdbpPrint("Searching NonPaged pool (%p : %p) for Tag: %.4s\n", MmNonPagedPoolStart, MmNonPagedPoolEnd0, (PCHAR)&Tag);
@ -3261,38 +3253,34 @@ ExpKdbgExtPoolFindNonPagedPool(
}
/* Check if allocation is valid */
PointerPte = MiAddressToPte(BaseVa);
if ((ULONG_PTR)PointerPte > PTE_TOP)
if (!MmIsAddressValid(BaseVa))
{
break;
continue;
}
if (PointerPte->u.Hard.Valid)
for (Entry = BaseVa;
(ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE;
Entry = (PVOID)((ULONG_PTR)Entry + 8))
{
for (Entry = BaseVa;
(ULONG_PTR)Entry + sizeof(POOL_HEADER) < (ULONG_PTR)BaseVa + PAGE_SIZE;
Entry = (PVOID)((ULONG_PTR)Entry + 8))
/* Try to find whether we have a pool entry */
if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, NonPagedPool))
{
/* Try to find whether we have a pool entry */
if (!ExpKdbgExtValidatePoolHeader(BaseVa, Entry, NonPagedPool))
{
continue;
}
continue;
}
if ((Entry->PoolTag & Mask) == (Tag & Mask))
if ((Entry->PoolTag & Mask) == (Tag & Mask))
{
if (FoundCallback != NULL)
{
if (FoundCallback != NULL)
{
FoundCallback(Entry, CallbackContext);
}
else
{
/* Print the line */
KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n",
Entry, Entry->BlockSize, Entry->PreviousSize,
Entry->PoolType ? "(Allocated)" : "(Free) ",
(PCHAR)&Entry->PoolTag);
}
FoundCallback(Entry, CallbackContext);
}
else
{
/* Print the line */
KdbpPrint("%p size: %4d previous size: %4d %s %.4s\n",
Entry, Entry->BlockSize, Entry->PreviousSize,
Entry->PoolType ? "(Allocated)" : "(Free) ",
(PCHAR)&Entry->PoolTag);
}
}
}