Skip to content

Commit eb22663

Browse files
uarif1bp3tk0v
authored andcommitted
x86/boot: Fix page table access in 5-level to 4-level paging transition
When transitioning from 5-level to 4-level paging, the existing code incorrectly accesses page table entries by directly dereferencing CR3 and applying PAGE_MASK. This approach has several issues: - __native_read_cr3() returns the raw CR3 register value, which on x86_64 includes not just the physical address but also flags. Bits above the physical address width of the system i.e. above __PHYSICAL_MASK_SHIFT) are also not masked. - The PGD entry is masked by PAGE_SIZE which doesn't take into account the higher bits such as _PAGE_BIT_NOPTISHADOW. Replace this with proper accessor functions: - native_read_cr3_pa(): Uses CR3_ADDR_MASK to additionally mask metadata out of CR3 (like SME or LAM bits). All remaining bits are real address bits or reserved and must be 0. - mask pgd value with PTE_PFN_MASK instead of PAGE_MASK, accounting for flags above bit 51 (_PAGE_BIT_NOPTISHADOW in particular). Bits below 51, but above the max physical address are reserved and must be 0. Fixes: e9d0e63 ("x86/boot/compressed/64: Prepare new top-level page table for trampoline") Reported-by: Michael van der Westhuizen <rmikey@meta.com> Reported-by: Tobias Fleig <tfleig@meta.com> Co-developed-by: Kiryl Shutsemau <kas@kernel.org> Signed-off-by: Kiryl Shutsemau <kas@kernel.org> Signed-off-by: Usama Arif <usamaarif642@gmail.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://lore.kernel.org/r/a482fd68-ce54-472d-8df1-33d6ac9f6bb5@intel.com
1 parent 5385dec commit eb22663

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

arch/x86/boot/compressed/pgtable_64.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <asm/bootparam.h>
44
#include <asm/bootparam_utils.h>
55
#include <asm/e820/types.h>
6+
#include <asm/pgtable.h>
67
#include <asm/processor.h>
78
#include "../string.h"
89
#include "efi.h"
@@ -168,9 +169,10 @@ asmlinkage void configure_5level_paging(struct boot_params *bp, void *pgtable)
168169
* For 4- to 5-level paging transition, set up current CR3 as
169170
* the first and the only entry in a new top-level page table.
170171
*/
171-
*trampoline_32bit = __native_read_cr3() | _PAGE_TABLE_NOENC;
172+
*trampoline_32bit = native_read_cr3_pa() | _PAGE_TABLE_NOENC;
172173
} else {
173-
unsigned long src;
174+
u64 *new_cr3;
175+
pgd_t *pgdp;
174176

175177
/*
176178
* For 5- to 4-level paging transition, copy page table pointed
@@ -180,8 +182,9 @@ asmlinkage void configure_5level_paging(struct boot_params *bp, void *pgtable)
180182
* We cannot just point to the page table from trampoline as it
181183
* may be above 4G.
182184
*/
183-
src = *(unsigned long *)__native_read_cr3() & PAGE_MASK;
184-
memcpy(trampoline_32bit, (void *)src, PAGE_SIZE);
185+
pgdp = (pgd_t *)native_read_cr3_pa();
186+
new_cr3 = (u64 *)(native_pgd_val(pgdp[0]) & PTE_PFN_MASK);
187+
memcpy(trampoline_32bit, new_cr3, PAGE_SIZE);
185188
}
186189

187190
toggle_la57(trampoline_32bit);

0 commit comments

Comments
 (0)