[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20130711143301.1f014c7b@kryten>
Date: Thu, 11 Jul 2013 14:33:01 +1000
From: Anton Blanchard <anton@...ba.org>
To: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
Namhyung Kim <namhyung@...nel.org>,
Jiri Olsa <jolsa@...hat.com>, David Ahern <dsahern@...il.com>,
Pekka Enberg <penberg@...nel.org>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] perf annotate: Fix SEGV with assembly labels
I'm getting a SEGV when running perf annotate on a ppc64 box. The
objdump -S output causing the SEGV looks like:
b .ret_from_except_lite
c00000000000a508: b c00000000000a4d4 <.ret_from_except_lite>
1: bl .save_nvgprs
c00000000000a50c: bl c00000000000a110 <.save_nvgprs>
symbol__parse_objdump_line makes an effort to distinguish between
instruction addresses and assembly labels but the check is
insufficent.
In the above case we get line_ip = 1, and (line_ip - start) is
positive so our offset < 0 check does not catch it.
Fix this by adding an unsigned comparison against start.
Signed-off-by: Anton Blanchard <anton@...ba.org>
Cc: <stable@...nel.org>
---
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index d102716..a791d23 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -809,7 +809,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
end = map__rip_2objdump(map, sym->end);
offset = line_ip - start;
- if (offset < 0 || (u64)line_ip > end)
+ if (offset < 0 || (u64)line_ip < start || (u64)line_ip > end)
offset = -1;
else
parsed_line = tmp2 + 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists