On Fri, Jan 17, 2025 at 12:05:51PM +0100, Juergen Gross wrote:
> 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: Juergen Gross <jgross@xxxxxxxx>
> ---
> This patch is meant to be applied to the following stable kernels:
> - linux-6.6
> - linux-6.1
> - linux-5.15
> - linux-5.10
> ---
> arch/x86/xen/xen-asm.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
> index 901b60516683..6231f6efb4ee 100644
> --- a/arch/x86/xen/xen-asm.S
> +++ b/arch/x86/xen/xen-asm.S
> @@ -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
> --
> 2.43.0
>
>
Now queued up, thanks!
greg k-h
