Commit 43c72339 authored by Juergen Gross's avatar Juergen Gross Committed by Wen Zhiwei
Browse files

x86/xen: fix SLS mitigation in xen_hypercall_iret() 

stable inclusion
from stable-v6.6.74
commit 7d082fb20aa288a419c1d3a39dbd47a0b00ca177
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7d082fb20aa288a419c1d3a39dbd47a0b00ca177



--------------------------------

The backport of upstream patch a2796dff62d6 ("x86/xen: don't do PV iret
hypercall through hypercall page") missed to adapt the SLS mitigation
config check from CONFIG_MITIGATION_SLS to CONFIG_SLS.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 5b978504

arch/x86/xen/xen-asm.S

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ SYM_CODE_END(xen_early_idt_handler_array) 
	push %rax

	mov  $__HYPERVISOR_iret, %eax

	syscall		/* Do the IRET. */

#ifdef CONFIG_MITIGATION_SLS

#ifdef CONFIG_SLS

	int3

#endif

.endm