linux-kernel - Re: [PATCH 6.1] x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2024071537-denatured-unspoken-62fc@gregkh>
Date: Mon, 15 Jul 2024 13:41:44 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Borislav Petkov <bp@...en8.de>
Cc: Jim Mattson <jmattson@...gle.com>, Ingo Molnar <mingo@...nel.org>,
	x86@...nel.org, linux-kernel@...r.kernel.org,
	Greg Thelen <gthelen@...gle.com>, stable@...r.kernel.org
Subject: Re: [PATCH 6.1] x86/retpoline: Move a NOENDBR annotation to the SRSO
 dummy return thunk

On Tue, Jul 09, 2024 at 04:12:38PM +0200, Borislav Petkov wrote:
> From: Jim Mattson <jmattson@...gle.com>
> Subject: [PATCH] x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
> 
> The linux-6.1-y backport of commit b377c66ae350 ("x86/retpoline: Add
> NOENDBR annotation to the SRSO dummy return thunk") misplaced the new
> NOENDBR annotation, repeating the annotation on __x86_return_thunk,
> rather than adding the annotation to the !CONFIG_CPU_SRSO version of
> srso_alias_untrain_ret, as intended.
> 
> Move the annotation to the right place.
> 
> Fixes: 0bdc64e9e716 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk")
> Reported-by: Greg Thelen <gthelen@...gle.com>
> Signed-off-by: Jim Mattson <jmattson@...gle.com>
> Acked-by: Borislav Petkov (AMD) <bp@...en8.de>
> Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
> Cc: stable@...r.kernel.org
> ---
>  arch/x86/lib/retpoline.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Both now queued up, thanks.

greg k-h