This is a note to let you know that I've just added the patch titled
x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
to the 6.6-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-retpoline-add-noendbr-annotation-to-the-srso-dummy-return-thunk.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b377c66ae3509ccea596512d6afb4777711c4870 Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Date: Fri, 5 Apr 2024 16:46:37 +0200
Subject: x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
From: Borislav Petkov (AMD) <bp@xxxxxxxxx>
commit b377c66ae3509ccea596512d6afb4777711c4870 upstream.
srso_alias_untrain_ret() is special code, even if it is a dummy
which is called in the !SRSO case, so annotate it like its real
counterpart, to address the following objtool splat:
vmlinux.o: warning: objtool: .export_symbol+0x2b290: data relocation to !ENDBR: srso_alias_untrain_ret+0x0
Fixes: 4535e1a4174c ("x86/bugs: Fix the SRSO mitigation on Zen3/4")
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240405144637.17908-1-bp@xxxxxxxxxx
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
@@ -223,6 +223,7 @@ SYM_CODE_END(srso_return_thunk)
/* Dummy for the alternative in CALL_UNTRAIN_RET. */
SYM_CODE_START(srso_alias_untrain_ret)
ANNOTATE_UNRET_SAFE
+ ANNOTATE_NOENDBR
ret
int3
SYM_FUNC_END(srso_alias_untrain_ret)
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.6/x86-cpu-amd-get-rid-of-amd_erratum_1054.patch
queue-6.6/x86-retpoline-add-noendbr-annotation-to-the-srso-dummy-return-thunk.patch
queue-6.6/drm-i915-pre-populate-the-cursor-physical-dma-addres.patch
queue-6.6/x86-srso-improve-i-cache-locality-for-alias-mitigation.patch
queue-6.6/x86-bugs-fix-the-srso-mitigation-on-zen3-4.patch
queue-6.6/x86-retpoline-do-the-necessary-fixup-to-the-zen3-4-srso-return-thunk-for-srso.patch
queue-6.6/x86-srso-disentangle-rethunk-dependent-options.patch
queue-6.6/x86-cpu-amd-move-the-div0-bug-detection-to-the-zen1-.patch
queue-6.6/x86-cpu-amd-carve-out-the-erratum-1386-fix.patch
queue-6.6/x86-nospec-refactor-untrain_ret.patch
queue-6.6/mm-treewide-replace-pud_large-with-pud_leaf.patch
queue-6.6/x86-cpu-amd-add-x86_feature_zen1.patch
queue-6.6/x86-cpu-amd-add-zenx-generations-flags.patch
queue-6.6/x86-cpu-amd-move-erratum-1076-fix-into-the-zen1-init.patch
queue-6.6/x86-cpu-amd-move-zenbleed-check-to-the-zen2-init-fun.patch
