diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-01-18 16:28:26 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-01-19 16:31:28 +0100 |
| commit | 6f41c34d69eb005e7848716bbcafc979b35037d5 (patch) | |
| tree | b5f5f6275ac19cc185a127c2f8a913f46019d705 /arch/x86/entry | |
| parent | 6cfb521ac0d5b97470883ff9b7facae264b7ab12 (diff) | |
| download | op-kernel-dev-6f41c34d69eb005e7848716bbcafc979b35037d5.zip op-kernel-dev-6f41c34d69eb005e7848716bbcafc979b35037d5.tar.gz | |
x86/mce: Make machine check speculation protected
The machine check idtentry uses an indirect branch directly from the low
level code. This evades the speculation protection.
Replace it by a direct call into C code and issue the indirect call there
so the compiler can apply the proper speculation protection.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by:Borislav Petkov <bp@alien8.de>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Niced-by: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801181626290.1847@nanos
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d54a0ed..63f4320 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1258,7 +1258,7 @@ idtentry async_page_fault do_async_page_fault has_error_code=1 #endif #ifdef CONFIG_X86_MCE -idtentry machine_check has_error_code=0 paranoid=1 do_sym=*machine_check_vector(%rip) +idtentry machine_check do_mce has_error_code=0 paranoid=1 #endif /* |
