]> git.ipfire.org Git - thirdparty/linux.git/commit
x86/srso: Fix return thunks in generated code
authorJosh Poimboeuf <jpoimboe@kernel.org>
Fri, 28 Jul 2023 22:28:43 +0000 (17:28 -0500)
committerBorislav Petkov (AMD) <bp@alien8.de>
Sat, 29 Jul 2023 12:15:19 +0000 (14:15 +0200)
commit238ec850b95a02dcdff3edc86781aa913549282f
tree0fa80998fd217be07aa85987a22c60883d0e0821
parentd893832d0e1ef41c72cdae444268c1d64a2be8ad
x86/srso: Fix return thunks in generated code

Set X86_FEATURE_RETHUNK when enabling the SRSO mitigation so that
generated code (e.g., ftrace, static call, eBPF) generates "jmp
__x86_return_thunk" instead of RET.

  [ bp: Add a comment. ]

Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation")
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/bugs.c