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

[NTOSKRNL:MM]

Browse source 
- Add a DPRINT with more info to the 'Hash == TableMask' assertion
- Validate pool tags on free also for big allocations
- Validate pool tag earlier, before tracking the free operation
CORE-6929

svn path=/trunk/; revision=58246
This commit is contained in:
Thomas Faber 2013-01-28 18:27:21 +00:00
parent 55be9e4adc
commit 1a683bbb89
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/ntoskrnl/mm/ARM3/expool.c
View file

@ -570,7 +570,12 @@ ExpRemovePoolTracker(IN ULONG Key,
// We should have only ended up with an empty entry if we've reached // We should have only ended up with an empty entry if we've reached
// the last bucket // the last bucket
// //
if (!TableEntry->Key) ASSERT(Hash == TableMask); if (!TableEntry->Key)
{
DPRINT1("Empty item reached in tracker table. Tag=0x%08lx, NumberOfBytes=%lu, PoolType=%d\n",
Key, (ULONG)NumberOfBytes, PoolType);
ASSERT(Hash == TableMask);
}
// //
// This path is hit when we don't have an entry, and the current bucket // This path is hit when we don't have an entry, and the current bucket
@ -2071,6 +2076,15 @@ ExFreePoolWithTag(IN PVOID P,
Tag &= ~PROTECTED_POOL; Tag &= ~PROTECTED_POOL;
} }
//
// Check block tag
//
if (TagToFree && TagToFree != Tag)
{
DPRINT1("Freeing pool - invalid tag specified: %.4s != %.4s\n", (char*)&TagToFree, (char*)&Tag);
KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree);
}
// //
// We have our tag and our page count, so we can go ahead and remove this // We have our tag and our page count, so we can go ahead and remove this
// tracker now // tracker now
@ -2143,13 +2157,6 @@ ExFreePoolWithTag(IN PVOID P,
Tag = Entry->PoolTag; Tag = Entry->PoolTag;
if (Tag & PROTECTED_POOL) Tag &= ~PROTECTED_POOL; if (Tag & PROTECTED_POOL) Tag &= ~PROTECTED_POOL;
//
// Stop tracking this allocation
//
ExpRemovePoolTracker(Tag,
BlockSize * POOL_BLOCK_SIZE,
Entry->PoolType - 1);
// //
// Check block tag // Check block tag
// //
@ -2159,6 +2166,13 @@ ExFreePoolWithTag(IN PVOID P,
KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree); KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Tag, TagToFree);
} }
//
// Track the removal of this allocation
//
ExpRemovePoolTracker(Tag,
BlockSize * POOL_BLOCK_SIZE,
Entry->PoolType - 1);
// //
// Is this allocation small enough to have come from a lookaside list? // Is this allocation small enough to have come from a lookaside list?
// //