x86/srso: Add a forgotten NOENDBR annotation
authorBorislav Petkov (AMD) <bp@alien8.de>
Fri, 28 Jul 2023 21:03:22 +0000 (23:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Aug 2023 18:03:51 +0000 (20:03 +0200)
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@linux-foundation.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/lib/retpoline.S

index 764c7ed..30e76fa 100644 (file)
@@ -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