Commit a63eaa3e authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Kamal Mostafa

x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code

commit 83c133cf upstream.

The NMI entry code that switches to the normal kernel stack needs to
be very careful not to clobber any extra stack slots on the NMI
stack.  The code is fine under the assumption that SWAPGS is just a
normal instruction, but that assumption isn't really true.  Use
SWAPGS_UNSAFE_STACK instead.

This is part of a fix for some random crashes that Sasha saw.

Fixes: 9b6e6a83 ("x86/nmi/64: Switch stacks on userspace NMI entry")
Reported-and-tested-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: http://lkml.kernel.org/r/974bc40edffdb5c2950a5c4977f821a446b76178.1442791737.git.luto@kernel.orgSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
[ luis: backported to 3.16:
  - file rename: arch/x86/entry/entry_64.S -> arch/x86/kernel/entry_64.S
  - adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 13d29654
...@@ -1772,9 +1772,12 @@ ENTRY(nmi) ...@@ -1772,9 +1772,12 @@ ENTRY(nmi)
* we don't want to enable interrupts, because then we'll end * we don't want to enable interrupts, because then we'll end
* up in an awkward situation in which IRQs are on but NMIs * up in an awkward situation in which IRQs are on but NMIs
* are off. * are off.
*
* We also must not push anything to the stack before switching
* stacks lest we corrupt the "NMI executing" variable.
*/ */
SWAPGS SWAPGS_UNSAFE_STACK
cld cld
movq %rsp, %rdx movq %rsp, %rdx
movq PER_CPU_VAR(kernel_stack), %rsp movq PER_CPU_VAR(kernel_stack), %rsp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment