diff options
authorJoerg Roedel <>2018-04-19 20:26:00 +0200
committerThomas Gleixner <>2018-04-20 11:52:00 +0200
commit05189820da23fc87ee2a7d87c20257f298af27f4 (patch)
parentd6ef1f194b7569af8b8397876dc9ab07649d63cb (diff)
x86/power/64: Fix page-table setup for temporary text mapping
On a system with 4-level page-tables there is no p4d, so the pud in the pgd should be mapped. The old code before commit fb43d6cb91ef already did that. The change from above commit causes an invalid page-table which causes undefined behavior. In one report it caused triple faults. Fix it by changing the p4d back to pud. Fixes: fb43d6cb91ef ('x86/mm: Do not auto-massage page protections') Reported-by: Borislav Petkov <> Signed-off-by: Joerg Roedel <> Signed-off-by: Thomas Gleixner <> Tested-by: Michal Kubecek <> Tested-by: Borislav Petkov <> Cc: Cc: Cc: Cc: Cc: Dave Hansen <> Link:
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index 48b14b534897..ccf4a49bb065 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -98,7 +98,7 @@ static int set_up_temporary_text_mapping(pgd_t *pgd)
set_pgd(pgd + pgd_index(restore_jump_address), new_pgd);
} else {
/* No p4d for 4-level paging: point the pgd to the pud page table */
- pgd_t new_pgd = __pgd(__pa(p4d) | pgprot_val(pgtable_prot));
+ pgd_t new_pgd = __pgd(__pa(pud) | pgprot_val(pgtable_prot));
set_pgd(pgd + pgd_index(restore_jump_address), new_pgd);