Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/retpolines: Enable the default thunk warning only on relevant configs

The using-default-thunk warning check makes sense only with
configurations which actually enable the special return thunks.

Otherwise, it fires on unrelated 32-bit configs on which the special
return thunks won't even work (they're 64-bit only) and, what is more,
those configs even go off into the weeds when booting in the
alternatives patching code, leading to a dead machine.

Fixes: 4461438a8405 ("x86/retpoline: Ensure default return thunk isn't used at runtime")
Reported-by: Klara Modin <klarasmodin@gmail.com>
Reported-by: Erhard Furtner <erhard_f@mailbox.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Tested-by: Klara Modin <klarasmodin@gmail.com>
Link: https://lore.kernel.org/r/78e0d19c-b77a-4169-a80f-2eef91f4a1d6@gmail.com
Link: https://lore.kernel.org/r/20240413024956.488d474e@yea

+7
+7
arch/x86/lib/retpoline.S
··· 382 382 SYM_CODE_START(__x86_return_thunk) 383 383 UNWIND_HINT_FUNC 384 384 ANNOTATE_NOENDBR 385 + #if defined(CONFIG_MITIGATION_UNRET_ENTRY) || \ 386 + defined(CONFIG_MITIGATION_SRSO) || \ 387 + defined(CONFIG_MITIGATION_CALL_DEPTH_TRACKING) 385 388 ALTERNATIVE __stringify(ANNOTATE_UNRET_SAFE; ret), \ 386 389 "jmp warn_thunk_thunk", X86_FEATURE_ALWAYS 390 + #else 391 + ANNOTATE_UNRET_SAFE 392 + ret 393 + #endif 387 394 int3 388 395 SYM_CODE_END(__x86_return_thunk) 389 396 EXPORT_SYMBOL(__x86_return_thunk)