On 08/06/18 12:20, Zeng, Star wrote: > Cc Jian. Right; I believe a non-empty commit message would be helpful. (Issue description, circumstances of the failure, what the exact edk2 security feature or setting is that the current LegacyBiosDxe code conflicts with, ...)
Thanks, Laszlo > Thanks, > Star > > -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of Ruiyu > Ni > Sent: Monday, August 6, 2018 5:57 PM > To: [email protected] > Cc: Zeng, Star <[email protected]> > Subject: [edk2] [PATCH] IntelFrameworkModulePkg/Csm: Set CSM memory executable > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni <[email protected]> > Cc: Star Zeng <[email protected]> > --- > .../Csm/LegacyBiosDxe/LegacyBios.c | 22 > +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > index 8f14687b28..f86d00b53f 100644 > --- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > +++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c > @@ -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 @@ -83,10 +84,21 @@ > AllocateLegacyMemory ( > // > if (!EFI_ERROR (Status)) { > *Result = (EFI_PHYSICAL_ADDRESS) (UINTN) MemPage; > + 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 reach here the status = EFI_SUCCESS > - // > + > return Status; > } > > -- > 2.16.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
