]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
x86/entry/32: Fix IRET exception
authorPeter Zijlstra <peterz@infradead.org>
Wed, 20 Nov 2019 12:05:06 +0000 (13:05 +0100)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:22:25 +0000 (14:22 -0300)
commit0d4ebe4dbdb55442f817dadc88a26c3b0d7663f2
treeadae84a01f1d3ef3b13b36b9ef9134cf8f68ab98
parent669d6a0b3eca7b0284d9c99b61be4d6e0c683965
x86/entry/32: Fix IRET exception

BugLink: https://bugs.launchpad.net/bugs/1854861
commit 40ad2199580e248dce2a2ebb722854180c334b9e upstream.

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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
arch/x86/entry/entry_32.S