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.

Fixes: baa41469a7b9 ("objtool: Implement stack validation 2.0")
Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com>
---
 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 4f0c4aea8f6f..5814e907f8c2 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;
 
-- 
2.13.3

Reply via email to