From: Jian J Wang <jian.j.wang@intel.com>
To: edk2-devel@lists.01.org
Cc: Jiewen Yao <jiewen.yao@intel.com>,
Star Zeng <star.zeng@intel.com>, Eric Dong <eric.dong@intel.com>
Subject: [PATCH 2/2] MdeModulePkg/DxeIpl: Mark page table as read-only
Date: Wed, 29 Nov 2017 16:46:40 +0800 [thread overview]
Message-ID: <20171129084640.20076-3-jian.j.wang@intel.com> (raw)
In-Reply-To: <20171129084640.20076-1-jian.j.wang@intel.com>
This patch will set the memory pages used for page table as read-only
memory after the paging is setup. CR0.WP must set to let it take into
effect.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
---
MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c | 166 +++++++++++++++++++++++
MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h | 14 ++
2 files changed, 180 insertions(+)
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
index 29b6205e88..7a859606c6 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
@@ -234,6 +234,166 @@ Split1GPageTo2M (
}
}
+/**
+ Set one page (4KB) of memory to be read-only.
+
+ @param[in] PageTableBase Base address of page table (CR3).
+ @param[in] Address Start address of a page to be set as read-only.
+
+**/
+VOID
+SetPageReadOnly (
+ IN UINTN PageTableBase,
+ IN PHYSICAL_ADDRESS Address
+ )
+{
+ UINTN Index;
+ UINTN Index1;
+ UINTN Index2;
+ UINTN Index3;
+ UINTN Index4;
+ UINT64 *L1PageTable;
+ UINT64 *L2PageTable;
+ UINT64 *L3PageTable;
+ UINT64 *L4PageTable;
+ UINT64 AddressEncMask;
+ PHYSICAL_ADDRESS PhysicalAddress;
+
+ ASSERT (PageTableBase != 0);
+
+ Index4 = ((UINTN)RShiftU64 (Address, PAGING_L4_ADDRESS_SHIFT)) &
+ PAGING_PAE_INDEX_MASK;
+ ASSERT (Index4 < PAGING_PML4E_NUMBER);
+
+ Index3 = ((UINTN)Address >> PAGING_L3_ADDRESS_SHIFT) & PAGING_PAE_INDEX_MASK;
+ Index2 = ((UINTN)Address >> PAGING_L2_ADDRESS_SHIFT) & PAGING_PAE_INDEX_MASK;
+ Index1 = ((UINTN)Address >> PAGING_L1_ADDRESS_SHIFT) & PAGING_PAE_INDEX_MASK;
+
+ //
+ // Make sure AddressEncMask is contained to smallest supported address field.
+ //
+ AddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) &
+ PAGING_1G_ADDRESS_MASK_64;
+
+ L4PageTable = (UINT64 *)(UINTN)PageTableBase;
+ L3PageTable = (UINT64 *)(UINTN)(L4PageTable[Index4] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ if ((L3PageTable[Index3] & IA32_PG_PS) != 0) {
+ // 1G page. Split to 2M.
+ L2PageTable = AllocatePages (1);
+ ASSERT (L2PageTable != NULL);
+
+ PhysicalAddress = L3PageTable[Index3] & PAGING_1G_ADDRESS_MASK_64;
+ for (Index = 0; Index < EFI_PAGE_SIZE/sizeof (UINT64); ++Index) {
+ L2PageTable[Index] = PhysicalAddress | AddressEncMask |
+ IA32_PG_PS | IA32_PG_P | IA32_PG_RW;
+ PhysicalAddress += SIZE_2MB;
+ }
+
+ L3PageTable[Index3] = (UINT64) (UINTN) L2PageTable | AddressEncMask |
+ IA32_PG_P | IA32_PG_RW;
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L2PageTable);
+ }
+
+ L2PageTable = (UINT64 *)(UINTN)(L3PageTable[Index3] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ if ((L2PageTable[Index2] & IA32_PG_PS) != 0) {
+ // 2M page. Split to 4K.
+ L1PageTable = AllocatePages (1);
+ ASSERT (L1PageTable != NULL);
+
+ PhysicalAddress = L2PageTable[Index2] & PAGING_2M_ADDRESS_MASK_64;
+ for (Index = 0; Index < EFI_PAGE_SIZE/sizeof (UINT64); ++Index) {
+ L1PageTable[Index] = PhysicalAddress | AddressEncMask |
+ IA32_PG_P | IA32_PG_RW;
+ PhysicalAddress += SIZE_4KB;
+ }
+
+ L2PageTable[Index2] = (UINT64)(UINTN)L1PageTable | AddressEncMask |
+ IA32_PG_P | IA32_PG_RW;
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L1PageTable);
+ }
+
+ // 4k
+ L1PageTable = (UINT64 *)(UINTN)(L2PageTable[Index2] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ L1PageTable[Index1] &= ~IA32_PG_RW;
+}
+
+/**
+ Prevent the memory pages used for page table from been overwritten.
+
+ @param[in] PageTableBase Base address of page table (CR3).
+
+**/
+VOID
+EnablePageTableProtection (
+ IN UINTN PageTableBase
+ )
+{
+ UINTN Index2;
+ UINTN Index3;
+ UINTN Index4;
+ UINT64 *L1PageTable;
+ UINT64 *L2PageTable;
+ UINT64 *L3PageTable;
+ UINT64 *L4PageTable;
+ UINT64 AddressEncMask;
+
+ //
+ // Disable write protection, because we need to mark page table to be write
+ // protected.
+ //
+ AsmWriteCr0 (AsmReadCr0() & ~CR0_WP);
+
+ AddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) &
+ PAGING_1G_ADDRESS_MASK_64;
+ L4PageTable = (UINT64 *)PageTableBase;
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L4PageTable);
+
+ for (Index4 = 0; Index4 < PAGING_PML4E_NUMBER; Index4++) {
+ L3PageTable = (UINT64 *)(UINTN)(L4PageTable[Index4] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ if (L3PageTable == NULL) {
+ continue;
+ }
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L3PageTable);
+
+ for (Index3 = 0; Index3 < EFI_PAGE_SIZE/sizeof(UINT64); Index3++) {
+ if ((L3PageTable[Index3] & IA32_PG_PS) != 0) {
+ // 1G
+ continue;
+ }
+
+ L2PageTable = (UINT64 *)(UINTN)(L3PageTable[Index3] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ if (L2PageTable == NULL) {
+ continue;
+ }
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L2PageTable);
+
+ for (Index2 = 0; Index2 < EFI_PAGE_SIZE/sizeof(UINT64); Index2++) {
+ if ((L2PageTable[Index2] & IA32_PG_PS) != 0) {
+ // 2M
+ continue;
+ }
+
+ L1PageTable = (UINT64 *)(UINTN)(L2PageTable[Index2] & ~AddressEncMask &
+ PAGING_4K_ADDRESS_MASK_64);
+ if (L1PageTable == NULL) {
+ continue;
+ }
+ SetPageReadOnly (PageTableBase, (EFI_PHYSICAL_ADDRESS)(UINTN)L1PageTable);
+ }
+ }
+ }
+
+ //
+ // Enable write protection, after page table updated.
+ //
+ AsmWriteCr0 (AsmReadCr0() | CR0_WP);
+}
+
/**
Allocates and fills in the Page Directory and Page Table Entries to
establish a 1:1 Virtual to Physical mapping.
@@ -430,6 +590,12 @@ CreateIdentityMappingPageTables (
);
}
+ //
+ // Protect the page table by marking the memory used for page table to be
+ // read-only.
+ //
+ EnablePageTableProtection ((UINTN)PageMap);
+
if (PcdGetBool (PcdSetNxForStack)) {
EnableExecuteDisableBit ();
}
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
index 7c9bb49e3e..6d1961b6f8 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
@@ -148,11 +148,25 @@ typedef union {
#pragma pack()
+#define CR0_WP BIT16
+
#define IA32_PG_P BIT0
#define IA32_PG_RW BIT1
+#define IA32_PG_PS BIT7
+
+#define PAGING_PAE_INDEX_MASK 0x1FF
+#define PAGING_4K_ADDRESS_MASK_64 0x000FFFFFFFFFF000ull
+#define PAGING_2M_ADDRESS_MASK_64 0x000FFFFFFFE00000ull
#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull
+#define PAGING_L1_ADDRESS_SHIFT 12
+#define PAGING_L2_ADDRESS_SHIFT 21
+#define PAGING_L3_ADDRESS_SHIFT 30
+#define PAGING_L4_ADDRESS_SHIFT 39
+
+#define PAGING_PML4E_NUMBER 4
+
/**
Enable Execute Disable Bit.
--
2.14.1.windows.1
next prev parent reply other threads:[~2017-11-29 8:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 8:46 [PATCH 0/2] Enable page table write protection Jian J Wang
2017-11-29 8:46 ` [PATCH 1/2] UefiCpuPkg/CpuDxe: Check CR0.WP before changing page table Jian J Wang
2017-11-29 8:46 ` Jian J Wang [this message]
2017-11-29 9:15 ` [PATCH 0/2] Enable page table write protection Yao, Jiewen
2017-11-29 10:24 ` Wang, Jian J
2017-11-29 10:56 ` Yao, Jiewen
2017-11-29 12:15 ` Wang, Jian J
2017-11-29 13:35 ` Yao, Jiewen
2017-11-30 0:44 ` Wang, Jian J
2017-11-30 0:51 ` Yao, Jiewen
2017-11-30 1:16 ` Wang, Jian J
2017-11-30 1:36 ` Yao, Jiewen
2017-11-30 1:43 ` Yao, Jiewen
2017-11-30 1:46 ` Wang, Jian J
2017-11-30 1:59 ` Yao, Jiewen
2017-11-30 2:02 ` Wang, Jian J
2017-11-30 2:36 ` Wang, Jian J
2017-11-30 1:37 ` Andrew Fish
2017-11-30 1:52 ` Wang, Jian J
2017-11-29 12:38 ` Laszlo Ersek
2017-11-29 12:46 ` Wang, Jian J
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171129084640.20076-3-jian.j.wang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox