Peter Zijlstra 5de0a325c4 objtool/x86: Fix SRSO mess ... commit 4ae68b26c3 upstream. Objtool --rethunk does two things: - it collects all (tail) call's of __x86_return_thunk and places them into .return_sites. These are typically compiler generated, but RET also emits this same. - it fudges the validation of the __x86_return_thunk symbol; because this symbol is inside another instruction, it can't actually find the instruction pointed to by the symbol offset and gets upset. Because these two things pertained to the same symbol, there was no pressing need to separate these two separate things. However, alas, along comes SRSO and more crazy things to deal with appeared. The SRSO patch itself added the following symbol names to identify as rethunk: 'srso_untrain_ret', 'srso_safe_ret' and '__ret' Where '__ret' is the old retbleed return thunk, 'srso_safe_ret' is a new similarly embedded return thunk, and 'srso_untrain_ret' is completely unrelated to anything the above does (and was only included because of that INT3 vs UD2 issue fixed previous). Clear things up by adding a second category for the embedded instruction thing. Fixes: fb3bd914b3 ("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.704502245@infradead.org Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2023-08-30 16:18:10 +02:00
..
arch/x86	objtool/x86: Fix SRSO mess	2023-08-30 16:18:10 +02:00
Documentation	objtool: Support stack layout changes in alternatives	2021-01-14 09:53:54 -06:00
include/objtool	objtool/x86: Fix SRSO mess	2023-08-30 16:18:10 +02:00
.gitignore	objtool: Rework header include paths	2021-01-13 18:13:14 -06:00
Build	objtool: Enable compilation of objtool for all architectures	2020-05-20 09:17:28 -05:00
builtin-check.c	x86/retbleed: Add fine grained Kconfig knobs	2022-07-23 12:54:10 +02:00
builtin-orc.c	objtool: Collate parse_options() users	2021-03-06 12:44:23 +01:00
check.c	objtool/x86: Fix SRSO mess	2023-08-30 16:18:10 +02:00
elf.c	objtool: Preserve special st_shndx indexes in elf_update_symbol	2022-10-26 12:34:37 +02:00
Makefile	kbuild: Allow kernel installation packaging to override pkg-config	2023-02-01 08:27:30 +01:00
objtool.c	x86,objtool: Create .return_sites	2022-07-23 12:53:58 +02:00
orc_dump.c	x86/unwind/orc: Change REG_SP_INDIRECT	2021-02-10 20:53:51 +01:00
orc_gen.c	objtool: Introduce CFI hash	2022-07-23 12:53:51 +02:00
special.c	objtool,x86: Replace alternatives with .retpoline_sites	2022-07-23 12:53:51 +02:00
sync-check.sh	Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict	2021-04-02 12:36:30 +02:00
weak.c	objtool: Refactor ORC section generation	2021-01-14 09:53:42 -06:00