mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
objtool/x86: Fixup frame-pointer vs rethunk
commitdbf4600877
upstream. For stack-validation of a frame-pointer build, objtool validates that every CALL instruction is preceded by a frame-setup. The new SRSO return thunks violate this with their RSB stuffing trickery. Extend the __fentry__ exception to also cover the embedded_insn case used for this. This cures: vmlinux.o: warning: objtool: srso_untrain_ret+0xd: call without frame pointer save/setup Fixes:4ae68b26c3
("objtool/x86: Fix SRSO mess") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/r/20230816115921.GH980931@hirez.programming.kicks-ass.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dbeb65be5b
commit
baca23d4be
1 changed files with 11 additions and 6 deletions
|
@ -2174,12 +2174,17 @@ static int decode_sections(struct objtool_file *file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static bool is_fentry_call(struct instruction *insn)
|
||||
static bool is_special_call(struct instruction *insn)
|
||||
{
|
||||
if (insn->type == INSN_CALL &&
|
||||
insn->call_dest &&
|
||||
insn->call_dest->fentry)
|
||||
return true;
|
||||
if (insn->type == INSN_CALL) {
|
||||
struct symbol *dest = insn->call_dest;
|
||||
|
||||
if (!dest)
|
||||
return false;
|
||||
|
||||
if (dest->fentry)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -3125,7 +3130,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (!no_fp && func && !is_fentry_call(insn) &&
|
||||
if (!no_fp && func && !is_special_call(insn) &&
|
||||
!has_valid_stack_frame(&state)) {
|
||||
WARN_FUNC("call without frame pointer save/setup",
|
||||
sec, insn->offset);
|
||||
|
|
Loading…
Add table
Reference in a new issue