This is a note to let you know that I've just added the patch titled
x86/srso: Add a forgotten NOENDBR annotation
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-srso-add-a-forgotten-noendbr-annotation.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 17babc32cda82eb14df1960512c995491822fc22 Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Date: Fri, 28 Jul 2023 23:03:22 +0200
Subject: x86/srso: Add a forgotten NOENDBR annotation
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Upstream commit: 3bbbe97ad83db8d9df06daf027b0840188de625d
Fix:
vmlinux.o: warning: objtool: .export_symbol+0x29e40: data relocation to !ENDBR: srso_untrain_ret_alias+0x0
Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/lib/retpoline.S | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/lib/retpoline.S
+++ b/arch/x86/lib/retpoline.S
@@ -94,6 +94,7 @@ SYM_CODE_END(__x86_indirect_thunk_array)
.section .text.__x86.rethunk_untrain
SYM_START(srso_untrain_ret_alias, SYM_L_GLOBAL, SYM_A_NONE)
+ ANNOTATE_NOENDBR
ASM_NOP2
lfence
jmp __x86_return_thunk
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.1/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-srso-add-ibpb_brtype-support.patch
queue-6.1/x86-cpu-kvm-add-support-for-cpuid_80000021_eax.patch
queue-6.1/x86-srso-tie-sbpb-bit-setting-to-microcode-patch-detection.patch
queue-6.1/x86-bugs-increase-the-x86-bugs-vector-size-to-two-u32s.patch
queue-6.1/x86-srso-add-a-forgotten-noendbr-annotation.patch
queue-6.1/x86-srso-add-ibpb-on-vmexit.patch
queue-6.1/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-6.1/x86-srso-add-ibpb.patch
queue-6.1/x86-srso-fix-return-thunks-in-generated-code.patch
queue-6.1/x86-srso-add-a-speculative-ras-overflow-mitigation.patch
queue-6.1/x86-srso-add-srso_no-support.patch
