x86/entry/compat: Add missing CLAC to entry_INT80_32
authorAndy Lutomirski <luto@kernel.org>
Wed, 24 Feb 2016 20:18:49 +0000 (12:18 -0800)
committerSasha Levin <sasha.levin@oracle.com>
Wed, 13 Apr 2016 21:14:26 +0000 (17:14 -0400)
[ Upstream commit 3d44d51bd339766f0178f0cf2e8d048b4a4872aa ]

This doesn't seem to fix a regression -- I don't think the CLAC was
ever there.

I double-checked in a debugger: entries through the int80 gate do
not automatically clear AC.

Stable maintainers: I can provide a backport to 4.3 and earlier if
needed.  This needs to be backported all the way to 3.10.

Reported-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.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> # v3.10 and later
Fixes: 63bcff2a307b ("x86, smap: Add STAC and CLAC instructions to control user space access")
Link: http://lkml.kernel.org/r/b02b7e71ae54074be01fc171cbd4b72517055c0e.1456345086.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
arch/x86/ia32/ia32entry.S

index 72bf268..27e5494 100644 (file)
@@ -511,6 +511,7 @@ ENTRY(ia32_syscall)
         * it is too small to ever cause noticeable irq latency.
         */
        PARAVIRT_ADJUST_EXCEPTION_FRAME
+       ASM_CLAC                        /* Do this early to minimize exposure */
        SWAPGS
        ENABLE_INTERRUPTS(CLBR_NONE)