x86/entry/32: Fix IRET exception
authorPeter Zijlstra <peterz@infradead.org>
Wed, 20 Nov 2019 12:05:06 +0000 (13:05 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 21 Nov 2019 18:37:43 +0000 (19:37 +0100)
commit40ad2199580e248dce2a2ebb722854180c334b9e
treeb5e3473eaf27430c458b7393e61f5e423d814569
parent880a98c339961eaa074393e3a2117cbe9125b8bb
x86/entry/32: Fix IRET exception

As reported by Lai, the commit 3c88c692c287 ("x86/stackframe/32:
Provide consistent pt_regs") wrecked the IRET EXTABLE entry by making
.Lirq_return not point at IRET.

Fix this by placing IRET_FRAME in RESTORE_REGS, to mirror how
FIXUP_FRAME is part of SAVE_ALL.

Fixes: 3c88c692c287 ("x86/stackframe/32: Provide consistent pt_regs")
Reported-by: Lai Jiangshan <laijs@linux.alibaba.com>
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