Commit 2b232a22 authored by Julien Thierry's avatar Julien Thierry Committed by Josh Poimboeuf

objtool: Handle calling non-function symbols in other sections

Relocation for a call destination could point to a symbol that has
type STT_NOTYPE.

Lookup such a symbol when no function is available.
Signed-off-by: default avatarJulien Thierry <jthierry@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
parent fb136219
...@@ -815,6 +815,17 @@ static void remove_insn_ops(struct instruction *insn) ...@@ -815,6 +815,17 @@ static void remove_insn_ops(struct instruction *insn)
} }
} }
static struct symbol *find_call_destination(struct section *sec, unsigned long offset)
{
struct symbol *call_dest;
call_dest = find_func_by_offset(sec, offset);
if (!call_dest)
call_dest = find_symbol_by_offset(sec, offset);
return call_dest;
}
/* /*
* Find the destination instructions for all calls. * Find the destination instructions for all calls.
*/ */
...@@ -832,9 +843,7 @@ static int add_call_destinations(struct objtool_file *file) ...@@ -832,9 +843,7 @@ static int add_call_destinations(struct objtool_file *file)
insn->offset, insn->len); insn->offset, insn->len);
if (!reloc) { if (!reloc) {
dest_off = arch_jump_destination(insn); dest_off = arch_jump_destination(insn);
insn->call_dest = find_func_by_offset(insn->sec, dest_off); insn->call_dest = find_call_destination(insn->sec, dest_off);
if (!insn->call_dest)
insn->call_dest = find_symbol_by_offset(insn->sec, dest_off);
if (insn->ignore) if (insn->ignore)
continue; continue;
...@@ -852,8 +861,8 @@ static int add_call_destinations(struct objtool_file *file) ...@@ -852,8 +861,8 @@ static int add_call_destinations(struct objtool_file *file)
} else if (reloc->sym->type == STT_SECTION) { } else if (reloc->sym->type == STT_SECTION) {
dest_off = arch_dest_reloc_offset(reloc->addend); dest_off = arch_dest_reloc_offset(reloc->addend);
insn->call_dest = find_func_by_offset(reloc->sym->sec, insn->call_dest = find_call_destination(reloc->sym->sec,
dest_off); dest_off);
if (!insn->call_dest) { if (!insn->call_dest) {
WARN_FUNC("can't find call dest symbol at %s+0x%lx", WARN_FUNC("can't find call dest symbol at %s+0x%lx",
insn->sec, insn->offset, insn->sec, insn->offset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment