diff options
| author | Andy Lutomirski <luto@kernel.org> | 2017-08-07 22:43:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 07:13:15 -0400 |
| commit | e93c17301ac55321fc18e0f8316e924e58a83c8c (patch) | |
| tree | 34dea282e59b05d5e40da598295d46af3602127b | |
| parent | 8d31f80eb38819e4f2905ad21c0e8998382a08f7 (diff) | |
x86/asm/64: Clear AC on NMI entries
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>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/entry/entry_64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d271fb79248f..6d078b89a5e8 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S | |||
| @@ -1211,6 +1211,8 @@ ENTRY(nmi) | |||
| 1211 | * other IST entries. | 1211 | * other IST entries. |
| 1212 | */ | 1212 | */ |
| 1213 | 1213 | ||
| 1214 | ASM_CLAC | ||
| 1215 | |||
| 1214 | /* Use %rdx as our temp variable throughout */ | 1216 | /* Use %rdx as our temp variable throughout */ |
| 1215 | pushq %rdx | 1217 | pushq %rdx |
| 1216 | 1218 | ||