Skip to content

Commit 4ba89dd

Browse files
jpoimboebp3tk0v
authored andcommitted
x86/alternatives: Remove faulty optimization
The following commit 095b830 ("x86/alternative: Make custom return thunk unconditional") made '__x86_return_thunk' a placeholder value. All code setting X86_FEATURE_RETHUNK also changes the value of 'x86_return_thunk'. So the optimization at the beginning of apply_returns() is dead code. Also, before the above-mentioned commit, the optimization actually had a bug It bypassed __static_call_fixup(), causing some raw returns to remain unpatched in static call trampolines. Thus the 'Fixes' tag. Fixes: d2408e0 ("x86/alternative: Optimize returns patching") Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/16d19d2249d4485d8380fb215ffaae81e6b8119e.1693889988.git.jpoimboe@kernel.org
1 parent ce9ecca commit 4ba89dd

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

arch/x86/kernel/alternative.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -720,14 +720,6 @@ void __init_or_module noinline apply_returns(s32 *start, s32 *end)
720720
{
721721
s32 *s;
722722

723-
/*
724-
* Do not patch out the default return thunks if those needed are the
725-
* ones generated by the compiler.
726-
*/
727-
if (cpu_feature_enabled(X86_FEATURE_RETHUNK) &&
728-
(x86_return_thunk == __x86_return_thunk))
729-
return;
730-
731723
for (s = start; s < end; s++) {
732724
void *dest = NULL, *addr = (void *)s + *s;
733725
struct insn insn;

0 commit comments

Comments
 (0)