Commit 54097309 authored by Peter Zijlstra's avatar Peter Zijlstra

x86/static_call: Fix __static_call_fixup()

Christian reported spurious module load crashes after some of Song's
module memory layout patches.

Turns out that if the very last instruction on the very last page of the
module is a 'JMP __x86_return_thunk' then __static_call_fixup() will
trip a fault and die.

And while the module rework made this slightly more likely to happen,
it's always been possible.

Fixes: ee88d363 ("x86,static_call: Use alternative RET encoding")
Reported-by: default avatarChristian Bricart <christian@bricart.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Link: https://lkml.kernel.org/r/20230816104419.GA982867@hirez.programming.kicks-ass.net
parent dbf46008
...@@ -186,6 +186,19 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform); ...@@ -186,6 +186,19 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform);
*/ */
bool __static_call_fixup(void *tramp, u8 op, void *dest) bool __static_call_fixup(void *tramp, u8 op, void *dest)
{ {
unsigned long addr = (unsigned long)tramp;
/*
* Not all .return_sites are a static_call trampoline (most are not).
* Check if the 3 bytes after the return are still kernel text, if not,
* then this definitely is not a trampoline and we need not worry
* further.
*
* This avoids the memcmp() below tripping over pagefaults etc..
*/
if (((addr >> PAGE_SHIFT) != ((addr + 7) >> PAGE_SHIFT)) &&
!kernel_text_address(addr + 7))
return false;
if (memcmp(tramp+5, tramp_ud, 3)) { if (memcmp(tramp+5, tramp_ud, 3)) {
/* Not a trampoline site, not our problem. */ /* Not a trampoline site, not our problem. */
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment