lkml.org 
[lkml]   [2020]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] objtool: Fix off-by-one in symbol_by_offset()
On Fri, Apr 03, 2020 at 02:17:30PM +0100, Julien Thierry wrote:
> 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.
>
> Signed-off-by: Julien Thierry <jthierry@redhat.com>
> ---
> tools/objtool/elf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
> index 09ddc8f1def3..c4857fa3f1d1 100644
> --- a/tools/objtool/elf.c
> +++ b/tools/objtool/elf.c
> @@ -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;

Thanks - looks like this fixes 2a362ecc3ec9 ("objtool: Optimize
find_symbol_*() and read_symbols()").

--
Josh

\
 
 \ /
  Last update: 2020-04-03 16:51    [W:0.123 / U:2.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site