]> asedeno.scripts.mit.edu Git - linux.git/commit
x86/entry/32: Fix NMI vs ESPFIX
authorPeter Zijlstra <peterz@infradead.org>
Wed, 20 Nov 2019 14:02:26 +0000 (15:02 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 21 Nov 2019 18:37:44 +0000 (19:37 +0100)
commit895429076512e9d1cf5428181076299c90713159
tree7eff4b7910d6460b397c3b1601dd532536321aab
parenta1a338e5b6fe9e0a39c57c232dc96c198bb53e47
x86/entry/32: Fix NMI vs ESPFIX

When the NMI lands on an ESPFIX_SS, we are on the entry stack and must
swizzle, otherwise we'll run do_nmi() on the entry stack, which is
BAD.

Also, similar to the normal exception path, we need to correct the
ESPFIX magic before leaving the entry stack, otherwise pt_regs will
present a non-flat stack pointer.

Tested by running sigreturn_32 concurrent with perf-record.

Fixes: e5862d0515ad ("x86/entry/32: Leave the kernel via trampoline stack")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: stable@kernel.org
arch/x86/entry/entry_32.S