]> git.itanic.dy.fi Git - linux-stable/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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Jul 2022 10:56:40 +0000 (12:56 +0200)
commita1a70a37ddbbf59e2abb41d0d7a8735b54754a4b
tree046c5b3d1deeadb6193414128a0016640c87b8f6
parent0283cbd1473380d3ae46f653eac128aebb288423
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
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/entry/entry_64.S
arch/x86/include/asm/traps.h
arch/x86/kernel/traps.c