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

Ring3: Added EFI_MEMORY_USER attribute.

This commit is contained in:
Mikhail Krichanov 2023-12-25 16:08:53 +03:00
parent 138ecce134
commit 8c069a27e5
4 changed files with 38 additions and 6 deletions
MdeModulePkg/Core/Dxe
Image
Image.c
Misc
MemoryProtection.c
MdePkg/Include/Uefi
UefiSpec.h
UefiCpuPkg/Library/CpuArchLib
CpuPageTable.c

2
MdeModulePkg/Core/Dxe/Image/Image.c
View File

@ -828,7 +828,7 @@ Done:
if (DstBufAlocated) {
ZeroMem ((VOID *)(UINTN)BufferAddress, EFI_PAGES_TO_SIZE (Image->NumberOfPages));
FreeAlignedPages ((VOID *)(UINTN)BufferAddress, Image->NumberOfPages);
Image->ImageBasePage = 0;
Image->ImageBasePage = 0;
}
if (RelocationData != NULL) {

13
MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
View File

@ -94,7 +94,8 @@ SetUefiImageMemoryAttributes (
**/
VOID
SetUefiImageProtectionAttributes (
IN UEFI_IMAGE_RECORD *ImageRecord
IN UEFI_IMAGE_RECORD *ImageRecord,
IN BOOLEAN IsUser
)
{
UEFI_IMAGE_RECORD_SEGMENT *ImageRecordSegment;
@ -107,7 +108,7 @@ SetUefiImageProtectionAttributes (
SetUefiImageMemoryAttributes (
SectionAddress,
ImageRecordSegment->Size,
ImageRecordSegment->Attributes
IsUser ? ImageRecordSegment->Attributes | (UINT32)EFI_MEMORY_USER : ImageRecordSegment->Attributes
);
SectionAddress += ImageRecordSegment->Size;
@ -231,7 +232,11 @@ ProtectUefiImage (
//
// CPU ARCH present. Update memory attribute directly.
//
SetUefiImageProtectionAttributes (ImageRecord);
if (AsciiStrStr (PdbPointer, "Ntfs") != NULL) {
SetUefiImageProtectionAttributes (ImageRecord, TRUE);
} else {
SetUefiImageProtectionAttributes (ImageRecord, FALSE);
}
}
Finish:
@ -663,7 +668,7 @@ MemoryProtectionCpuArchProtocolNotify (
//
// CPU ARCH present. Update memory attribute directly.
//
SetUefiImageProtectionAttributes (ImageRecord);
SetUefiImageProtectionAttributes (ImageRecord, FALSE);
}
Done:

8
MdePkg/Include/Uefi/UefiSpec.h
View File

@ -105,6 +105,12 @@ typedef enum {
//
#define EFI_MEMORY_CPU_CRYPTO 0x0000000000080000ULL
//
// If this flag is set, the memory region contains user code or data.
// If this flag is clear, the memory region contains supervisor code or data.
//
#define EFI_MEMORY_USER 0x0000000000100000ULL
//
// Runtime memory attribute
//
@ -130,7 +136,7 @@ typedef enum {
//
#define EFI_CACHE_ATTRIBUTE_MASK (EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB | EFI_MEMORY_UCE | EFI_MEMORY_WP)
#define EFI_MEMORY_ACCESS_MASK (EFI_MEMORY_RP | EFI_MEMORY_XP | EFI_MEMORY_RO)
#define EFI_MEMORY_ATTRIBUTE_MASK (EFI_MEMORY_ACCESS_MASK | EFI_MEMORY_SP | EFI_MEMORY_CPU_CRYPTO)
#define EFI_MEMORY_ATTRIBUTE_MASK (EFI_MEMORY_ACCESS_MASK | EFI_MEMORY_SP | EFI_MEMORY_CPU_CRYPTO | EFI_MEMORY_USER)
///
/// Memory descriptor version number.

21
UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c
View File

@ -467,6 +467,27 @@ ConvertPageEntryAttribute (
}
}
if ((Attributes & EFI_MEMORY_USER) != 0) {
switch (PageAction) {
case PageActionAssign:
case PageActionSet:
NewPageEntry |= IA32_PG_U;
break;
case PageActionClear:
NewPageEntry &= ~(UINT64)IA32_PG_U;
break;
}
} else {
switch (PageAction) {
case PageActionAssign:
NewPageEntry &= ~(UINT64)IA32_PG_U;
break;
case PageActionSet:
case PageActionClear:
break;
}
}
GetPagingDetails (&PagingContext->ContextData, NULL, &PageAttributes);
if ((*PageAttributes & PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED) != 0) {