objtool: Fix off-by-one in symbol_by_offset()
authorJulien Thierry <jthierry@redhat.com>
Fri, 3 Apr 2020 13:17:30 +0000 (14:17 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 22 Apr 2020 21:14:46 +0000 (23:14 +0200)
Sometimes, WARN_FUNC() and other users of symbol_by_offset() will
associate the first instruction of a symbol with the symbol preceding
it.  This is because symbol->offset + symbol->len is already outside of
the symbol's range.

Fixes: 2a362ecc3ec9 ("objtool: Optimize find_symbol_*() and read_symbols()")
Signed-off-by: Julien Thierry <jthierry@redhat.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
tools/objtool/elf.c

index 09ddc8f1def3cf328d3b5531391b4fc00a43804a..c4857fa3f1d18537c2bcbbc37c6f40b966ffd7e1 100644 (file)
@@ -105,7 +105,7 @@ static int symbol_by_offset(const void *key, const struct rb_node *node)
 
        if (*o < s->offset)
                return -1;
-       if (*o > s->offset + s->len)
+       if (*o >= s->offset + s->len)
                return 1;
 
        return 0;