tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/PiSmmCore: Check valid memory range.

Browse Source 
Call BS.AllocatePages in DXE driver and call SMM FreePages with the address of the buffer allocated in the DXE driver. SMM FreePages success and add a non-SMRAM range into SMM heap list. This is not an expected behavior. SMM FreePages should return error for this case and not free the pages.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1098

Change-Id: Ie5ffa1ac62c558aa418a8a3d7d0e8158b846e13b
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Eric Dong 2018-08-21 14:44:41 +08:00
parent 17da1b9108
commit f965b772fc
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
MdeModulePkg/Core/PiSmmCore/Page.c
View File

@ -862,6 +862,41 @@ SmmInternalFreePages (
return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE); return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE);
} }
/**
Check whether the input range is in memory map.
@param Memory Base address of memory being inputed.
@param NumberOfPages The number of pages.
@retval TRUE In memory map.
@retval FALSE Not in memory map.
**/
BOOLEAN
InMemMap (
IN EFI_PHYSICAL_ADDRESS Memory,
IN UINTN NumberOfPages
)
{
LIST_ENTRY *Link;
MEMORY_MAP *Entry;
EFI_PHYSICAL_ADDRESS Last;
Last = Memory + EFI_PAGES_TO_SIZE (NumberOfPages) - 1;
Link = gMemoryMap.ForwardLink;
while (Link != &gMemoryMap) {
Entry = CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);
Link = Link->ForwardLink;
if ((Entry->Start <= Memory) && (Entry->End >= Last)) {
return TRUE;
}
}
return FALSE;
}
/** /**
Frees previous allocated pages. Frees previous allocated pages.
@ -883,6 +918,10 @@ SmmFreePages (
EFI_STATUS Status; EFI_STATUS Status;
BOOLEAN IsGuarded; BOOLEAN IsGuarded;
if (!InMemMap(Memory, NumberOfPages)) {
return EFI_NOT_FOUND;
}
IsGuarded = IsHeapGuardEnabled () && IsMemoryGuarded (Memory); IsGuarded = IsHeapGuardEnabled () && IsMemoryGuarded (Memory);
Status = SmmInternalFreePages (Memory, NumberOfPages, IsGuarded); Status = SmmInternalFreePages (Memory, NumberOfPages, IsGuarded);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {