xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

objtool/x86: Fixup frame-pointer vs rethunk

Browse Source 
commit dbf46008775516f7f25c95b7760041c286299783 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: 4ae68b26c3ab ("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:
Peter Zijlstra
2023-08-16 13:59:21 +02:00
committed by Greg Kroah-Hartman
parent 26e3f7690c
commit 23e5987465
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/objtool/check.c
View File

@@ -2079,12 +2079,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 && struct symbol *dest = insn->call_dest;
insn->call_dest->fentry)
return true; if (!dest)
return false;
if (dest->fentry)
return true;
}
return false; return false;
} }
@@ -2958,7 +2963,7 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
if (ret) if (ret)
return ret; return ret;
if (!no_fp && func && !is_fentry_call(insn) && if (!no_fp && func && !is_special_call(insn) &&
!has_valid_stack_frame(&state)) { !has_valid_stack_frame(&state)) {
WARN_FUNC("call without frame pointer save/setup", WARN_FUNC("call without frame pointer save/setup",
sec, insn->offset); sec, insn->offset);