Skip to contentSkip to conversation

objtool: Fix off-by-one in symbol_by_offset()

PATCH In review Julien Thierry 3 participants 3 messages Apr 3, 2020 – Apr 6, 2020 objtool

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 objtool: Fix off-by-one in symbol_by_offset()

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.

---
 tools/objtool/elf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/elf.c +1 -1
index 09ddc8f1def3..c4857fa3f1d1 100644
@@ -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;
Signature · 1 line
2.21.1
#1 lore raw
Quoted 16 lines · Julien Thierry

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.

---
 tools/objtool/elf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/elf.c +0 -0
index 09ddc8f1def3..c4857fa3f1d1 100644

tools/objtool/elf.c static int symbol_by_offset(const void *key, const struct rb_node *node) · line 111

Quoted 8 lines
tools/objtool/elf.c +1 -1
@@ -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()").

Signature · 1 line
Josh