]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry()
authorLai Jiangshan <jiangshan.ljs@antgroup.com>
Thu, 21 Apr 2022 14:10:50 +0000 (22:10 +0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 19 Jul 2022 19:13:23 +0000 (16:13 -0300)
commit7f0f2134725521066a72ba73778266298da405d6
treeff9c6010850dadbdb75b1b3be913311b7b87a348
parent90f93ae2530b22c2703ffacc6ecd9c5b2c70e9e7
x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry()

commit ee774dac0da1543376a69fd90840af6aa86879b3 upstream.

The macro idtentry() (through idtentry_body()) calls error_entry()
unconditionally even on XENPV. But XENPV needs to only push and clear
regs.

PUSH_AND_CLEAR_REGS in error_entry() makes the stack not return to its
original place when the function returns, which means it is not possible
to convert it to a C function.

Carve out PUSH_AND_CLEAR_REGS out of error_entry() and into a separate
function and call it before error_entry() in order to avoid calling
error_entry() on XENPV.

It will also allow for error_entry() to be converted to C code that can
use inlined sync_regs() and save a function call.

  [ bp: Massage commit message. ]

Signed-off-by: Lai Jiangshan <jiangshan.ljs@antgroup.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20220503032107.680190-4-jiangshanlai@gmail.com
CVE-2022-29900
CVE-2022-29901
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
arch/x86/entry/entry_64.S