diff options
| author |   Lai Jiangshan <jiangshan.ljs@antgroup.com> | 2022-04-21 22:10:48 +0800 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2022-05-03 11:18:59 +0200 |
| commit | 0aca53c6b522f8d6e2681ca875acbbe105f5fdcf (patch) | |
| tree | 4ccbb959b3336d3b7d84f385e290175c6c32b4f2 /arch/x86/entry/entry_64.S | |
| parent | Linux 5.18-rc5 (diff) | |
| download | wireguard-linux-0aca53c6b522f8d6e2681ca875acbbe105f5fdcf.tar.xz wireguard-linux-0aca53c6b522f8d6e2681ca875acbbe105f5fdcf.zip | |
x86/traps: Use pt_regs directly in fixup_bad_iret()
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
Diffstat (limited to 'arch/x86/entry/entry_64.S')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 73d958522b6a..ecbfca3cc18c 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1061,9 +1061,12 @@ SYM_CODE_START_LOCAL(error_entry) * Pretend that the exception came from user mode: set up pt_regs * as if we faulted immediately after IRET. */ - mov %rsp, %rdi + popq %r12 /* save return addr in %12 */ + movq %rsp, %rdi /* arg0 = pt_regs pointer */ call fixup_bad_iret mov %rax, %rsp + ENCODE_FRAME_POINTER + pushq %r12 jmp .Lerror_entry_from_usermode_after_swapgs SYM_CODE_END(error_entry) |