Skip to content

Commit e93c173

Browse files
amlutoIngo Molnar
authored andcommitted
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 <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org Signed-off-by: Ingo Molnar <[email protected]>
1 parent 8d31f80 commit e93c173

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/x86/entry/entry_64.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,8 @@ ENTRY(nmi)
12111211
* other IST entries.
12121212
*/
12131213

1214+
ASM_CLAC
1215+
12141216
/* Use %rdx as our temp variable throughout */
12151217
pushq %rdx
12161218

0 commit comments

Comments
 (0)