diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-08-06 17:56:37 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2018-08-16 11:38:29 +0800 |
| commit | cd25509b1f85a71b243828955a2cbd655a836eff (patch) | |
| tree | 4b40885d14787df355c684a222cc6c6973a422cd /IntelFrameworkModulePkg | |
| parent | 0e967dff0642cedaef7bc63e5743f4b081a1db9a (diff) | |
| download | edk2-cd25509b1f85a71b243828955a2cbd655a836eff.tar.gz edk2-cd25509b1f85a71b243828955a2cbd655a836eff.tar.bz2 edk2-cd25509b1f85a71b243828955a2cbd655a836eff.zip | |
IntelFrameworkModulePkg/Csm: Set CSM memory executable
Commit b22a62be5cdc8fd19d87ec1ecfa5b28fb9be50ad
* IntelFrameworkModule/LegacyBios:Use reserved memory for legacy data
allocates reserved memory for holding legacy code/data.
But with PcdDxeNxMemoryProtectionPolicy set to certain value to
forbid execution when code is in certain type of memory, it's
possible that a platform forbids execution when code is in reserved
memory. The patch calls GCD service to allow such case otherwise
CPU exception may occur.
Code execution in BSCode area should be enabled by platform by
default.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jian Wang <jian.j.wang@intel.com>
Diffstat (limited to 'IntelFrameworkModulePkg')
| -rw-r--r-- | IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c index 8f14687b28..de859555f1 100644 --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -43,7 +43,7 @@ UINTN mStructureTablePages = 0; BOOLEAN mEndOfDxe = FALSE;
/**
- Allocate memory for legacy usage.
+ Allocate memory for legacy usage. The memory is executable.
@param AllocateType The type of allocation to perform.
@param MemoryType The type of memory to allocate.
@@ -51,8 +51,8 @@ BOOLEAN mEndOfDxe = FALSE; @param Pages Number of pages to allocate
@param Result Result of allocation
- @retval EFI_SUCCESS Legacy16 code loaded
- @retval Other No protocol installed, unload driver.
+ @retval EFI_SUCCESS Legacy memory is allocated successfully.
+ @retval Other Legacy memory is not allocated.
**/
EFI_STATUS
@@ -64,8 +64,9 @@ AllocateLegacyMemory ( OUT EFI_PHYSICAL_ADDRESS *Result
)
{
- EFI_STATUS Status;
- EFI_PHYSICAL_ADDRESS MemPage;
+ EFI_STATUS Status;
+ EFI_PHYSICAL_ADDRESS MemPage;
+ EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;
//
// Allocate Pages of memory less <= StartPageAddress
@@ -82,11 +83,28 @@ AllocateLegacyMemory ( // memory is already taken but that is ok.
//
if (!EFI_ERROR (Status)) {
+ if (MemoryType != EfiBootServicesCode) {
+ //
+ // Make sure that the buffer can be used to store code.
+ //
+ Status = gDS->GetMemorySpaceDescriptor (MemPage, &MemDesc);
+ if (!EFI_ERROR (Status) && (MemDesc.Attributes & EFI_MEMORY_XP) != 0) {
+ Status = gDS->SetMemorySpaceAttributes (
+ MemPage,
+ EFI_PAGES_TO_SIZE (Pages),
+ MemDesc.Attributes & (~EFI_MEMORY_XP)
+ );
+ }
+ if (EFI_ERROR (Status)) {
+ gBS->FreePages (MemPage, Pages);
+ }
+ }
+ }
+
+ if (!EFI_ERROR (Status)) {
*Result = (EFI_PHYSICAL_ADDRESS) (UINTN) MemPage;
}
- //
- // If reach here the status = EFI_SUCCESS
- //
+
return Status;
}
|