]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/xen: Add xenpv_restore_regs_and_return_to_usermode()
authorLai Jiangshan <laijs@linux.alibaba.com>
Fri, 26 Nov 2021 10:11:23 +0000 (18:11 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:49:11 +0000 (09:49 +0100)
commit98006843d7f88adbbbdd491e7d6e252742ebdc39
treecfb806242f161ebc2dd4155eddeb75b29d088b12
parent2347f1addce8cf3f26eae32bbba4d5627dd8d65c
x86/xen: Add xenpv_restore_regs_and_return_to_usermode()

BugLink: https://bugs.launchpad.net/bugs/1953731
[ Upstream commit 5c8f6a2e316efebb3ba93d8c1af258155dcf5632 ]

In the native case, PER_CPU_VAR(cpu_tss_rw + TSS_sp0) is the
trampoline stack. But XEN pv doesn't use trampoline stack, so
PER_CPU_VAR(cpu_tss_rw + TSS_sp0) is also the kernel stack.

In that case, source and destination stacks are identical, which means
that reusing swapgs_restore_regs_and_return_to_usermode() in XEN pv
would cause %rsp to move up to the top of the kernel stack and leave the
IRET frame below %rsp.

This is dangerous as it can be corrupted if #NMI / #MC hit as either of
these events occurring in the middle of the stack pushing would clobber
data on the (original) stack.

And, with  XEN pv, swapgs_restore_regs_and_return_to_usermode() pushing
the IRET frame on to the original address is useless and error-prone
when there is any future attempt to modify the code.

 [ bp: Massage commit message. ]

Fixes: 7f2590a110b8 ("x86/entry/64: Use a per-CPU trampoline stack for IDT entries")
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lkml.kernel.org/r/20211126101209.8613-4-jiangshanlai@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/x86/entry/entry_64.S
arch/x86/xen/xen-asm.S