x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
authorPeter Zijlstra <peterz@infradead.org>
Mon, 14 Aug 2023 11:44:28 +0000 (13:44 +0200)
committerBorislav Petkov (AMD) <bp@alien8.de>
Wed, 16 Aug 2023 07:39:16 +0000 (09:39 +0200)
commitaf023ef335f13c8b579298fc432daeef609a9e60
tree4d638d04629a7cf48dddeddfe3c6164416e24a20
parent77f67119004296a9b2503b377d610e08b08afc2a
x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()

  vmlinux.o: warning: objtool: srso_untrain_ret() falls through to next function __x86_return_skl()
  vmlinux.o: warning: objtool: __x86_return_thunk() falls through to next function __x86_return_skl()

This is because these functions (can) end with CALL, which objtool
does not consider a terminating instruction. Therefore, replace the
INT3 instruction (which is a non-fatal trap) with UD2 (which is a
fatal-trap).

This indicates execution will not continue past this point.

Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230814121148.637802730@infradead.org
arch/x86/lib/retpoline.S