tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/DxeCore: add sanity check for SetMemoryAttributes 

Heap Guard feature needs enough memory and paging to work. Otherwise
calling SetMemoryAttributes to change page attribute will fail. This
patch add necessary check of result of calling SetMemoryAttributes.
This can help users to debug their problem in enabling this feature.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Jian J Wang 2018-04-11 16:35:05 +08:00 committed by Star Zeng
parent 36db7492e1
commit a5cd613cdb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
View File

@ -580,6 +580,8 @@ SetGuardPage (
IN EFI_PHYSICAL_ADDRESS BaseAddress
)
{
EFI_STATUS Status;
if (gCpu == NULL) {
return;
}
@ -593,7 +595,8 @@ SetGuardPage (
// Note: This might overwrite other attributes needed by other features,
// such as NX memory protection.
//
gCpu->SetMemoryAttributes (gCpu, BaseAddress, EFI_PAGE_SIZE, EFI_MEMORY_RP);
Status = gCpu->SetMemoryAttributes (gCpu, BaseAddress, EFI_PAGE_SIZE, EFI_MEMORY_RP);
ASSERT_EFI_ERROR (Status);
mOnGuarding = FALSE;
}
@ -613,6 +616,7 @@ UnsetGuardPage (
)
{
UINT64 Attributes;
EFI_STATUS Status;
if (gCpu == NULL) {
return;
@ -638,7 +642,8 @@ UnsetGuardPage (
// such as memory protection (NX). Please make sure they are not enabled
// at the same time.
//
gCpu->SetMemoryAttributes (gCpu, BaseAddress, EFI_PAGE_SIZE, Attributes);
Status = gCpu->SetMemoryAttributes (gCpu, BaseAddress, EFI_PAGE_SIZE, Attributes);
ASSERT_EFI_ERROR (Status);
mOnGuarding = FALSE;
}