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

MdeModulePkg/DxeIpl: Use memory attribute PPI to remap the stack NX 

If the associated PCD is set to TRUE, use the memory attribute PPI to
remap the stack non-executable. This provides a generic method for doing
so, which will be used by ARM and AArch64 as well once they move to the
generic DxeIpl handoff implementation.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Oliver Smith-Denny <osde@linux.microsoft.com>
Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Ard Biesheuvel 2023-06-02 17:17:35 +02:00 committed by mergify[bot]
parent dfacaab57e
commit 9df2c0a555
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MdeModulePkg/Core/DxeIplPeim/DxeHandoff.c
View File

@ -2,12 +2,15 @@
Generic version of arch-specific functionality for DxeLoad. Generic version of arch-specific functionality for DxeLoad.
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2023, Google, LLC. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
#include "DxeIpl.h" #include "DxeIpl.h"
#include <Ppi/MemoryAttribute.h>
/** /**
Transfers control to DxeCore. Transfers control to DxeCore.
@ -25,9 +28,10 @@ HandOffToDxeCore (
IN EFI_PEI_HOB_POINTERS HobList IN EFI_PEI_HOB_POINTERS HobList
) )
{ {
VOID *BaseOfStack; VOID *BaseOfStack;
VOID *TopOfStack; VOID *TopOfStack;
EFI_STATUS Status; EFI_STATUS Status;
EDKII_MEMORY_ATTRIBUTE_PPI *MemoryPpi;
// //
// Allocate 128KB for the Stack // Allocate 128KB for the Stack
@ -35,6 +39,25 @@ HandOffToDxeCore (
BaseOfStack = AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE)); BaseOfStack = AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE));
ASSERT (BaseOfStack != NULL); ASSERT (BaseOfStack != NULL);
if (PcdGetBool (PcdSetNxForStack)) {
Status = PeiServicesLocatePpi (
&gEdkiiMemoryAttributePpiGuid,
0,
NULL,
(VOID **)&MemoryPpi
);
ASSERT_EFI_ERROR (Status);
Status = MemoryPpi->SetPermissions (
MemoryPpi,
(UINTN)BaseOfStack,
STACK_SIZE,
EFI_MEMORY_XP,
EFI_MEMORY_XP
);
ASSERT_EFI_ERROR (Status);
}
// //
// Compute the top of the stack we were allocated. Pre-allocate a UINTN // Compute the top of the stack we were allocated. Pre-allocate a UINTN
// for safety. // for safety.

5
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
View File

@ -91,6 +91,7 @@
gEfiPeiMemoryDiscoveredPpiGuid ## SOMETIMES_CONSUMES gEfiPeiMemoryDiscoveredPpiGuid ## SOMETIMES_CONSUMES
gEdkiiPeiBootInCapsuleOnDiskModePpiGuid ## SOMETIMES_CONSUMES gEdkiiPeiBootInCapsuleOnDiskModePpiGuid ## SOMETIMES_CONSUMES
gEdkiiPeiCapsuleOnDiskPpiGuid ## SOMETIMES_CONSUMES # Consumed on firmware update boot path gEdkiiPeiCapsuleOnDiskPpiGuid ## SOMETIMES_CONSUMES # Consumed on firmware update boot path
gEdkiiMemoryAttributePpiGuid ## SOMETIMES_CONSUMES
[Guids] [Guids]
## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation" ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation"
@ -117,10 +118,12 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize ## CONSUMES
[Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64] [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64]
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy ## SOMETIMES_CONSUMES
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIMES_CONSUMES
[Depex] [Depex]
gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid