]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/entry: Move PUSH_AND_CLEAR_REGS() back into error_entry
authorPeter Zijlstra <peterz@infradead.org>
Wed, 6 Jul 2022 13:33:30 +0000 (15:33 +0200)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 19 Jul 2022 19:20:06 +0000 (16:20 -0300)
commitb2e0cb8490a99ae2b855176c54d0536622a48188
tree50fd3d26d96e3438c3225cd0dbf6e217435de497
parentfc3b9e9939e7dcc3c7d34026c43d576d33f55ab6
x86/entry: Move PUSH_AND_CLEAR_REGS() back into error_entry

commit 2c08b9b38f5b0f4a6c2d29be22b695e4ec4a556b upstream.

Commit

  ee774dac0da1 ("x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry()")

moved PUSH_AND_CLEAR_REGS out of error_entry, into its own function, in
part to avoid calling error_entry() for XenPV.

However, commit

  7c81c0c9210c ("x86/entry: Avoid very early RET")

had to change that because the 'ret' was too early and moved it into
idtentry, bloating the text size, since idtentry is expanded for every
exception vector.

However, with the advent of xen_error_entry() in commit

  d147553b64bad ("x86/xen: Add UNTRAIN_RET")

it became possible to remove PUSH_AND_CLEAR_REGS from idtentry, back
into *error_entry().

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
[cascardo: error_entry still does cld]
CVE-2022-29900
CVE-2022-29901
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
arch/x86/entry/entry_64.S