mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
objtool: Fix UNWIND_HINT_{SAVE,RESTORE} across basic blocks
[ Upstream commit10b4c4bce3
] If SAVE and RESTORE unwind hints are in different basic blocks, and objtool sees the RESTORE before the SAVE, it errors out with: vmlinux.o: warning: objtool: vmw_port_hb_in+0x242: objtool isn't smart enough to handle this CFI save/restore combo In such a case, defer following the RESTORE block until the straight-line path gets followed later. Fixes:8faea26e61
("objtool: Re-add UNWIND_HINT_{SAVE_RESTORE}") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202402240702.zJFNmahW-lkp@intel.com/ Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/r/20240227073527.avcm5naavbv3cj5s@treble Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3428e59f5b
commit
39ee8d8c26
1 changed files with 12 additions and 0 deletions
|
@ -3620,6 +3620,18 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
|
|||
}
|
||||
|
||||
if (!save_insn->visited) {
|
||||
/*
|
||||
* If the restore hint insn is at the
|
||||
* beginning of a basic block and was
|
||||
* branched to from elsewhere, and the
|
||||
* save insn hasn't been visited yet,
|
||||
* defer following this branch for now.
|
||||
* It will be seen later via the
|
||||
* straight-line path.
|
||||
*/
|
||||
if (!prev_insn)
|
||||
return 0;
|
||||
|
||||
WARN_INSN(insn, "objtool isn't smart enough to handle this CFI save/restore combo");
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue