aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski2017-08-07 21:43:13 -0500
committerGreg Kroah-Hartman2017-08-24 19:02:36 -0500
commit64340986295dea6cf954caa630000a77775f9975 (patch)
treed8268498f4b3231d9483c8b7d6ac9a56b9ab77e4
parentc0b397fd6b2b8ed7b39a717340b85b4b1add5332 (diff)
downloadkernel-omap-64340986295dea6cf954caa630000a77775f9975.tar.gz
kernel-omap-64340986295dea6cf954caa630000a77775f9975.tar.xz
kernel-omap-64340986295dea6cf954caa630000a77775f9975.zip
x86/asm/64: Clear AC on NMI entries
commit e93c17301ac55321fc18e0f8316e924e58a83c8c upstream. This closes a hole in our SMAP implementation. This patch comes from grsecurity. Good catch! Signed-off-by: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/entry/entry_64.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index a55697d19824..cc0f2f5da19b 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1190,6 +1190,8 @@ ENTRY(nmi)
1190 * other IST entries. 1190 * other IST entries.
1191 */ 1191 */
1192 1192
1193 ASM_CLAC
1194
1193 /* Use %rdx as our temp variable throughout */ 1195 /* Use %rdx as our temp variable throughout */
1194 pushq %rdx 1196 pushq %rdx
1195 1197