Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_urgent_for_v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 rethunk fixes from Borislav Petkov:
"Fix the patching ordering between static calls and return thunks"
* tag 'x86_urgent_for_v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86,static_call: Fix static-call vs return-thunk
x86/alternatives: Remove faulty optimization
+2
-8
+2
-7
arch/x86/kernel/alternative.c
+2
-7
arch/x86/kernel/alternative.c
···
720
720
{
721
721
s32 *s;
722
722
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;
723
+
if (cpu_feature_enabled(X86_FEATURE_RETHUNK))
724
+
static_call_force_reinit();
730
725
731
726
for (s = start; s < end; s++) {
732
727
void *dest = NULL, *addr = (void *)s + *s;