mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +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
c70e2efa97
commit
37e6d8509c
1 changed files with 11 additions and 6 deletions
|
@ -2698,12 +2698,17 @@ static int decode_sections(struct objtool_file *file)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool is_fentry_call(struct instruction *insn)
|
static bool is_special_call(struct instruction *insn)
|
||||||
{
|
{
|
||||||
if (insn->type == INSN_CALL &&
|
if (insn->type == INSN_CALL) {
|
||||||
insn_call_dest(insn) &&
|
struct symbol *dest = insn_call_dest(insn);
|
||||||
insn_call_dest(insn)->fentry)
|
|
||||||
return true;
|
if (!dest)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (dest->fentry || dest->embedded_insn)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -3701,7 +3706,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (opts.stackval && func && !is_fentry_call(insn) &&
|
if (opts.stackval && func && !is_special_call(insn) &&
|
||||||
!has_valid_stack_frame(&state)) {
|
!has_valid_stack_frame(&state)) {
|
||||||
WARN_INSN(insn, "call without frame pointer save/setup");
|
WARN_INSN(insn, "call without frame pointer save/setup");
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in a new issue