x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
PATCH 1/1 x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
The linux-5.10-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.
--- arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/retpoline.S +1 -1
@@ -105,6 +105,7 @@ __EXPORT_THUNK(srso_alias_untrain_ret) /* dummy definition for alternatives */ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret)
@@ -258,7 +259,6 @@ SYM_CODE_START(__x86_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ANNOTATE_UNRET_SAFE - ANNOTATE_NOENDBR ret int3 SYM_CODE_END(__x86_return_thunk)
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Quoted 28 lines · Jim Mattson
The linux-5.10-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 ofsrso_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 <[email protected]>Signed-off-by Jim Mattson <[email protected]>--- arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/lib/retpoline.S +1
-0@@ -105,6 +105,7 @@ __EXPORT_THUNK(srso_alias_untrain_ret) /* dummy definition for alternatives */ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret)
arch/x86/lib/retpoline.S SYM_CODE_START(__x86_return_thunk) · line 261
Quoted 4 lines
arch/x86/lib/retpoline.S +0
-1@@ -258,7 +259,6 @@ SYM_CODE_START(__x86_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ANNOTATE_UNRET_SAFE - ANNOTATE_NOENDBR
Whoops, those two here didn't look right, thanks for catching this.
And looking at 6.1, it is wrong there too. :-\
commit 7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7
Author: Borislav Petkov (AMD) <[email protected]> Date: Fri Apr 5 16:46:37 2024 +0200
x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
commit b377c66ae3509ccea596512d6afb4777711c4870 upstream.
Greg (KH - there's another Greg on CC too :-)), do you prefer such stable-only fixes like that or should we revert the wrong backports and redo them?
Thx!
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 44 lines · Borislav Petkov
Quoted 28 lines · Jim Mattson
The linux-5.10-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 ofsrso_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 <[email protected]>Signed-off-by Jim Mattson <[email protected]>--- arch/x86/lib/retpoline.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/lib/retpoline.S +1
-0@@ -105,6 +105,7 @@ __EXPORT_THUNK(srso_alias_untrain_ret) /* dummy definition for alternatives */ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) ANNOTATE_UNRET_SAFE + ANNOTATE_NOENDBR ret int3 SYM_FUNC_END(srso_alias_untrain_ret)arch/x86/lib/retpoline.S SYM_CODE_START(__x86_return_thunk) · line 261
Quoted 4 lines
arch/x86/lib/retpoline.S +0
-1@@ -258,7 +259,6 @@ SYM_CODE_START(__x86_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ANNOTATE_UNRET_SAFE - ANNOTATE_NOENDBRWhoops, those two here didn't look right, thanks for catching this.
And looking at 6.1, it is wrong there too. :-\
commit
7ef6a7f9b32fdfc8bec0a10e6d5ac5374d4f02e7Author: Borislav Petkov (AMD) <[email protected]> Date: Fri Apr 5 16:46:37 2024 +0200
Quoted 6 lines
x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
commit
b377c66ae3509ccea596512d6afb4777711c4870upstream.Greg (KH - there's another Greg on CC too :-)), do you prefer such stable-only fixes like that or should we revert the wrong backports and redo them?
Sending fixups like this, for things that are already committed are fine. But note, someone needs to at least send them to the right place (i.e. no one cc:ed [email protected]...) if they wish to see them applied to a stable kernel...
thanks,
greg k-h
Borislav Petkov
maintainerQuoted 4 lines · Greg Kroah-Hartman
Sending fixups like this, for things that are already committed are fine. But note, someone needs to at least send them to the right place (i.e. no one cc:ed [email protected]...) if they wish to see them applied to a stable kernel...
Jim, should I or you want?
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 8 lines · Borislav Petkov
Quoted 4 lines · Greg Kroah-Hartman
Sending fixups like this, for things that are already committed are fine. But note, someone needs to at least send them to the right place (i.e. no one cc:ed [email protected]...) if they wish to see them applied to a stable kernel...
Jim, should I or you want?
Done.
Quoted 7 lines
Thx.
--
Regards/Gruss,
Boris.