Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 00:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL/MM]

Browse source 
- fix broken logic
- simplify calculation of remainig space to alter
- call ExFreePoolWithTag instead of ExFreePool
- return error on failure

svn path=/trunk/; revision=52614
This commit is contained in:
Jérôme Gardou 2011-07-10 17:21:38 +00:00
parent d28438f515
commit 0cb80213de
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/ntoskrnl/mm/region.c
View file

@ -53,7 +53,7 @@ MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress,
TAG_MM_REGION);
if (NewRegion1 == NULL)
{
ExFreePool(NewRegion2);
ExFreePoolWithTag(NewRegion2, TAG_MM_REGION);
return(NULL);
}
NewRegion1->Type = NewType;
@ -86,14 +86,14 @@ MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress,
}
else
{
ExFreePool(NewRegion2);
ExFreePoolWithTag(NewRegion2, TAG_MM_REGION);
}
/* Either remove or shrink the initial region. */
if (InitialBaseAddress == StartAddress)
{
RemoveEntryList(&InitialRegion->RegionListEntry);
ExFreePool(InitialRegion);
ExFreePoolWithTag(InitialRegion, TAG_MM_REGION);
}
else
{
@ -123,17 +123,6 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
*/
InitialRegion = MmFindRegion(BaseAddress, RegionListHead, StartAddress,
&InitialBaseAddress);
if (((char*)StartAddress + Length) >
((char*)InitialBaseAddress + InitialRegion->Length))
{
RemainingLength = ((char*)StartAddress + Length) -
((char*)InitialBaseAddress + InitialRegion->Length);
}
else
{
RemainingLength = 0;
}
/*
* If necessary then split the region into the affected and unaffected parts.
*/
@ -151,6 +140,11 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
{
NewRegion = InitialRegion;
}
if(NewRegion->Length < Length)
RemainingLength = Length - NewRegion->Length;
else
RemainingLength = 0;
/*
* Free any complete regions that are containing in the range of addresses
@ -163,7 +157,7 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
while (RemainingLength > 0 && CurrentRegion->Length <= RemainingLength &&
CurrentEntry != RegionListHead)
{
if (CurrentRegion->Type != NewType &&
if (CurrentRegion->Type != NewType ||
CurrentRegion->Protect != NewProtect)
{
AlterFunc(AddressSpace, CurrentBaseAddress, CurrentRegion->Length,
@ -176,7 +170,7 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
RemainingLength -= CurrentRegion->Length;
CurrentEntry = CurrentEntry->Flink;
RemoveEntryList(&CurrentRegion->RegionListEntry);
ExFreePool(CurrentRegion);
ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION);
CurrentRegion = CONTAINING_RECORD(CurrentEntry, MM_REGION,
RegionListEntry);
}
@ -188,10 +182,10 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
{
CurrentRegion = CONTAINING_RECORD(CurrentEntry, MM_REGION,
RegionListEntry);
if (CurrentRegion->Type != NewType &&
if (CurrentRegion->Type != NewType ||
CurrentRegion->Protect != NewProtect)
{
AlterFunc(AddressSpace, CurrentBaseAddress, CurrentRegion->Length,
AlterFunc(AddressSpace, CurrentBaseAddress, RemainingLength,
CurrentRegion->Type, CurrentRegion->Protect,
NewType, NewProtect);
}
@ -212,7 +206,7 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
{
NewRegion->Length += CurrentRegion->Length;
RemoveEntryList(&CurrentRegion->RegionListEntry);
ExFreePool(CurrentRegion);
ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION);
}
}
@ -229,9 +223,12 @@ MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress,
{
NewRegion->Length += CurrentRegion->Length;
RemoveEntryList(&CurrentRegion->RegionListEntry);
ExFreePool(CurrentRegion);
ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION);
}
}
if(NewRegion->Length < Length)
return(STATUS_NO_MEMORY);
return(STATUS_SUCCESS);
}