Commit-ID: 12b25729a194198e3c4289adaddc4115b10b094e
Gitweb: http://git.kernel.org/tip/12b25729a194198e3c4289adaddc4115b10b094e
Author: Josh Poimboeuf <jpoim...@redhat.com>
AuthorDate: Thu, 10 Aug 2017 16:37:25 -0500
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Fri, 11 Aug 2017 14:06:14 +0200
objtool: Fix validate_branch() return codes
The validate_branch() function should never return a negative value.
Errors are treated as warnings so that even if something goes wrong,
objtool does its best to generate ORC data for the rest of the file.
Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Brian Gerst <brge...@gmail.com>
Cc: Denys Vlasenko <dvlas...@redhat.com>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Fixes: baa41469a7b9 ("objtool: Implement stack validation 2.0")
Link:
http://lkml.kernel.org/r/d86671cfde823b50477cd2f6f548dfe54871e24d.1502401017.git.jpoim...@redhat.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
tools/objtool/check.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 4f0c4ae..5814e90 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1524,7 +1524,7 @@ static int validate_branch(struct objtool_file *file,
struct instruction *first,
if (insn->alt_group && list_empty(&insn->alts)) {
WARN_FUNC("don't know how to handle branch to middle of
alternative instruction group",
sec, insn->offset);
- return -1;
+ return 1;
}
while (1) {
@@ -1543,7 +1543,7 @@ static int validate_branch(struct objtool_file *file,
struct instruction *first,
if (func && insn->ignore) {
WARN_FUNC("BUG: why am I validating an ignored
function?",
sec, insn->offset);
- return -1;
+ return 1;
}
if (insn->visited) {
@@ -1681,7 +1681,7 @@ static int validate_branch(struct objtool_file *file,
struct instruction *first,
case INSN_STACK:
if (update_insn_state(insn, &state))
- return -1;
+ return 1;
break;
