Skip to content

Commit ab4200c

Browse files
mhiramatacmel
authored andcommitted
perf probe: Fix to die_entrypc() returns error correctly
Fix die_entrypc() to return error correctly if the DIE has no DW_AT_ranges attribute. Since dwarf_ranges() will treat the case as an empty ranges and return 0, we have to check it by ourselves. Fixes: 91e2f53 ("perf probe: Fix to show function entry line as probe-able") Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Link: http://lore.kernel.org/lkml/160645612634.2824037.5284932731175079426.stgit@devnote2 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent c0ee1d5 commit ab4200c

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

tools/perf/util/dwarf-aux.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,21 @@ bool die_is_func_def(Dwarf_Die *dw_die)
373373
int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr)
374374
{
375375
Dwarf_Addr base, end;
376+
Dwarf_Attribute attr;
376377

377378
if (!addr)
378379
return -EINVAL;
379380

380381
if (dwarf_entrypc(dw_die, addr) == 0)
381382
return 0;
382383

384+
/*
385+
* Since the dwarf_ranges() will return 0 if there is no
386+
* DW_AT_ranges attribute, we should check it first.
387+
*/
388+
if (!dwarf_attr(dw_die, DW_AT_ranges, &attr))
389+
return -ENOENT;
390+
383391
return dwarf_ranges(dw_die, 0, &base, addr, &end) < 0 ? -ENOENT : 0;
384392
}
385393

0 commit comments

Comments
 (0)