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

MdeModulePkg: Remove other attribute protection in UnsetGuardPage

Browse Source 
In UnsetGuardPage(), before SmmReadyToLock, remove NX and RO
memory attribute protection for guarded page since
EfiConventionalMemory in SMRAM is RW and executable before
SmmReadyToLock. If UnsetGuardPage() happens after SmmReadyToLock,
then apply EFI_MEMORY_XP to the guarded page to make sure
EfiConventionalMemory in SMRAM is NX since EfiConventionalMemory
in SMRAM is marked as NX in PiSmmCpuDxe driver when SmmReadyToLock.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
This commit is contained in:
Dun Tan 2023-05-16 15:51:50 +08:00 committed by Ray Ni
parent a78938f274
commit 8c99839776
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MdeModulePkg/Core/PiSmmCore/HeapGuard.c
View File

@ -553,9 +553,23 @@ UnsetGuardPage (
mSmmMemoryAttribute,
BaseAddress,
EFI_PAGE_SIZE,
EFI_MEMORY_RP
EFI_MEMORY_RP|EFI_MEMORY_RO|EFI_MEMORY_XP
);
ASSERT_EFI_ERROR (Status);
if (gST == NULL) {
//
// Make sure EfiConventionalMemory is NX after SmmReadyToLock
//
Status = mSmmMemoryAttribute->SetMemoryAttributes (
mSmmMemoryAttribute,
BaseAddress,
EFI_PAGE_SIZE,
EFI_MEMORY_XP
);
ASSERT_EFI_ERROR (Status);
}
mOnGuarding = FALSE;
}
}