From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752859AbdHJM2J (ORCPT ); Thu, 10 Aug 2017 08:28:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41417 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752283AbdHJM2H (ORCPT ); Thu, 10 Aug 2017 08:28:07 -0400 Date: Thu, 10 Aug 2017 05:22:23 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, bp@alien8.de, luto@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, jpoimboe@redhat.com Reply-To: jpoimboe@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, dvlasenk@redhat.com, luto@kernel.org, brgerst@gmail.com, bp@alien8.de, mingo@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: <314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org> References: <314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/64: Clear AC on NMI entries Git-Commit-ID: e93c17301ac55321fc18e0f8316e924e58a83c8c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e93c17301ac55321fc18e0f8316e924e58a83c8c Gitweb: http://git.kernel.org/tip/e93c17301ac55321fc18e0f8316e924e58a83c8c Author: Andy Lutomirski AuthorDate: Mon, 7 Aug 2017 19:43:13 -0700 Committer: Ingo Molnar CommitDate: Thu, 10 Aug 2017 13:13:15 +0200 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 Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/314cc9f294e8f14ed85485727556ad4f15bb1659.1502159503.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d271fb7..6d078b8 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1211,6 +1211,8 @@ ENTRY(nmi) * other IST entries. */ + ASM_CLAC + /* Use %rdx as our temp variable throughout */ pushq %rdx