summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2021-01-21 15:29:17 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 12:14:45 +0100
commit473c0c0a8d7dc8dcad96a6a820482c14736eae02 (patch)
treea714d4322d0d8dba2b87b954c9fb0a837d07868f /tools
parent828e8e61c55c1bb643d4a94165bbadaaf4410bfb (diff)
downloadlinux-473c0c0a8d7dc8dcad96a6a820482c14736eae02.tar.gz
linux-473c0c0a8d7dc8dcad96a6a820482c14736eae02.tar.bz2
linux-473c0c0a8d7dc8dcad96a6a820482c14736eae02.zip
objtool: Fix error handling for STD/CLD warnings
[ Upstream commit 6f567c9300a5ebd7b18c26dda1c8d6ffbdd0debd ] Actually return an error (and display a backtrace, if requested) for directional bit warnings. Fixes: 2f0f9e9ad7b3 ("objtool: Add Direction Flag validation") Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lore.kernel.org/r/dc70f2adbc72f09526f7cab5b6feb8bf7f6c5ad4.1611263461.git.jpoimboe@redhat.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/objtool/check.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 4bd30315eb62..2e154f00ccec 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2592,15 +2592,19 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
break;
case INSN_STD:
- if (state.df)
+ if (state.df) {
WARN_FUNC("recursive STD", sec, insn->offset);
+ return 1;
+ }
state.df = true;
break;
case INSN_CLD:
- if (!state.df && func)
+ if (!state.df && func) {
WARN_FUNC("redundant CLD", sec, insn->offset);
+ return 1;
+ }
state.df = false;
break;