]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/traps: Use pt_regs directly in fixup_bad_iret()
authorLai Jiangshan <jiangshan.ljs@antgroup.com>
Thu, 21 Apr 2022 14:10:48 +0000 (22:10 +0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 19 Jul 2022 19:13:22 +0000 (16:13 -0300)
commit6937b2ffcde87d8e8d2eae13d8281d56fecdd985
treeeb7906e618f4799858af75fe116fe6792b8cc481
parent6af3655399f89634c9a4e665c0b58aaa3ab1c936
x86/traps: Use pt_regs directly in fixup_bad_iret()

commit 0aca53c6b522f8d6e2681ca875acbbe105f5fdcf upstream.

Always stash the address error_entry() is going to return to, in %r12
and get rid of the void *error_entry_ret; slot in struct bad_iret_stack
which was supposed to account for it and pt_regs pushed on the stack.

After this, both fixup_bad_iret() and sync_regs() can work on a struct
pt_regs pointer directly.

  [ bp: Rewrite commit message, touch ups. ]

Signed-off-by: Lai Jiangshan <jiangshan.ljs@antgroup.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220503032107.680190-2-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
arch/x86/include/asm/traps.h
arch/x86/kernel/traps.c