linux-kernel - [tip:x86/urgent] x86/efi: Load fixmap GDT in efi_call_phys

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-cf40361ede6cf9dc09349e4c049dc0d166ca2d8b@git.kernel.org>
Date:   Wed, 12 Sep 2018 12:57:53 -0700
From:   tip-bot for Guenter Roeck <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     jroedel@...e.de, linux-kernel@...r.kernel.org, tglx@...utronix.de,
        linux@...ck-us.net, ard.biesheuvel@...aro.org, hpa@...or.com,
        torvalds@...ux-foundation.org, mingo@...nel.org,
        luto@...capital.net
Subject: [tip:x86/urgent] x86/efi: Load fixmap GDT in efi_call_phys_epilog()
 before setting %cr3

Commit-ID:  cf40361ede6cf9dc09349e4c049dc0d166ca2d8b
Gitweb:     https://git.kernel.org/tip/cf40361ede6cf9dc09349e4c049dc0d166ca2d8b
Author:     Guenter Roeck <linux@...ck-us.net>
AuthorDate: Tue, 11 Sep 2018 11:18:12 -0700
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 12 Sep 2018 21:53:34 +0200

x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3

Commit eeb89e2bb1ac ("x86/efi: Load fixmap GDT in efi_call_phys_epilog()")
moved loading the fixmap in efi_call_phys_epilog() after load_cr3() since
it was assumed to be more logical.

Turns out this is incorrect: In efi_call_phys_prolog(), the gdt with its
physical address is loaded first, and when the %cr3 is reloaded in _epilog
from initial_page_table to swapper_pg_dir again the gdt is no longer
mapped.  This results in a triple fault if an interrupt occurs after
load_cr3() and before load_fixmap_gdt(0). Calling load_fixmap_gdt(0) first
restores the execution order prior to commit eeb89e2bb1ac and fixes the
problem.

Fixes: eeb89e2bb1ac ("x86/efi: Load fixmap GDT in efi_call_phys_epilog()")
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: linux-efi@...r.kernel.org
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Joerg Roedel <jroedel@...e.de>
Link: https://lkml.kernel.org/r/1536689892-21538-1-git-send-email-linux@roeck-us.net

---
 arch/x86/platform/efi/efi_32.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index 05ca14222463..9959657127f4 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -85,10 +85,9 @@ pgd_t * __init efi_call_phys_prolog(void)
 
 void __init efi_call_phys_epilog(pgd_t *save_pgd)
 {
+	load_fixmap_gdt(0);
 	load_cr3(save_pgd);
 	__flush_tlb_all();
-
-	load_fixmap_gdt(0);
 }
 
 void __init efi_runtime_update_mappings(void)