diff options
| author | Kirill A. Shutemov | 2019-06-20 13:24:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-21 09:03:09 +0200 |
| commit | 94968c37b6d37ccf02d3d58e2d2e8b8f262bd300 (patch) | |
| tree | 76ce99105793abe09c78ed075239ff6dcf248edb | |
| parent | x86/boot/64: Fix crash if kernel image crosses page table boundary (diff) | |
| download | kernel-qcow2-linux-94968c37b6d37ccf02d3d58e2d2e8b8f262bd300.tar.gz kernel-qcow2-linux-94968c37b6d37ccf02d3d58e2d2e8b8f262bd300.tar.xz kernel-qcow2-linux-94968c37b6d37ccf02d3d58e2d2e8b8f262bd300.zip | |
x86/boot/64: Add missing fixup_pointer() for next_early_pgt access
[ Upstream commit c1887159eb48ba40e775584cfb2a443962cf1a05 ]
__startup_64() uses fixup_pointer() to access global variables in a
position-independent fashion. Access to next_early_pgt was wrapped into the
helper, but one instance in the 5-level paging branch was missed.
GCC generates a R_X86_64_PC32 PC-relative relocation for the access which
doesn't trigger the issue, but Clang emmits a R_X86_64_32S which leads to
an invalid memory access and system reboot.
Fixes: 187e91fe5e91 ("x86/boot/64/clang: Use fixup_pointer() to access 'next_early_pgt'")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Alexander Potapenko <glider@google.com>
Link: https://lkml.kernel.org/r/20190620112422.29264-1-kirill.shutemov@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/x86/kernel/head64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index cc5b519dc687..250cfa85b633 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -184,7 +184,8 @@ unsigned long __head __startup_64(unsigned long physaddr, pgtable_flags = _KERNPG_TABLE_NOENC + sme_get_me_mask(); if (la57) { - p4d = fixup_pointer(early_dynamic_pgts[next_early_pgt++], physaddr); + p4d = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], + physaddr); i = (physaddr >> PGDIR_SHIFT) % PTRS_PER_PGD; pgd[i + 0] = (pgdval_t)p4d + pgtable_flags; |