From: Jiri Olsa <jolsa@redhat.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung.kim@lge.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 08/17] perf probe: Fix to handle errors in line_range searching
Date: Mon, 14 Apr 2014 16:17:32 +0200 [thread overview]
Message-ID: <1397485061-17215-9-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1397485061-17215-1-git-send-email-jolsa@redhat.com>
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
As Namhyung reported(https://lkml.org/lkml/2014/4/1/89),
current perf-probe -L option doesn't handle errors in line-range
searching correctly. It causes a SEGV if an error occured in the
line-range searching.
----
$ perf probe -x ./perf -v -L map__load
Open Debuginfo file: /home/namhyung/project/linux/tools/perf/perf
fname: util/map.c, lineno:153
New line range: 153 to 2147483647
path: (null)
Segmentation fault (core dumped)
----
This is because line_range_inline_cb() ignores errors
from find_line_range_by_line() which means that lr->path is
already freed on the error path in find_line_range_by_line().
As a result, get_real_path() accesses the lr->path and it
causes a NULL pointer exception.
This fixes line_range_inline_cb() to handle the error correctly,
and report it to the caller.
Anyway, this just fixes a possible SEGV bug, Namhyung's patch
is also required.
Reported-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20140402054831.19080.27006.stgit@ltc230.yrl.intra.hitachi.co.jp
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/util/probe-finder.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 3bf0c8c..fae274e 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1475,14 +1475,15 @@ static int find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)
static int line_range_inline_cb(Dwarf_Die *in_die, void *data)
{
- find_line_range_by_line(in_die, data);
+ int ret = find_line_range_by_line(in_die, data);
/*
* We have to check all instances of inlined function, because
* some execution paths can be optimized out depends on the
- * function argument of instances
+ * function argument of instances. However, if an error occurs,
+ * it should be handled by the caller.
*/
- return 0;
+ return ret < 0 ? ret : 0;
}
/* Search function definition from function name */
--
1.8.3.1
next prev parent reply other threads:[~2014-04-14 14:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 14:17 [GIT PULL v3 00/17] perf/core fixes Jiri Olsa
2014-04-14 14:17 ` [PATCH 01/17] perf top: Fix documentation of invalid -s option Jiri Olsa
2014-04-14 14:17 ` [PATCH 02/17] tools lib traceevent: Print event name when show warning if possible Jiri Olsa
2014-04-14 14:17 ` [PATCH 03/17] tools lib traceevent: Do not call warning() directly Jiri Olsa
2014-04-14 14:17 ` [PATCH 04/17] perf callchains: Disable unwind libraries when libelf isn't found Jiri Olsa
2014-04-14 14:17 ` [PATCH 05/17] MAINTAINERS: Change e-mail to kernel.org one Jiri Olsa
2014-04-14 14:17 ` [PATCH 06/17] perf tools: Pick up libdw without explicit LIBDW_DIR Jiri Olsa
2014-04-14 14:17 ` [PATCH 07/17] perf probe: Fix --line option behavior Jiri Olsa
2014-04-14 14:17 ` Jiri Olsa [this message]
2014-04-14 14:17 ` [PATCH 09/17] perf probe: Use dwarf_getcfi_elf() instead of dwarf_getcfi() Jiri Olsa
2014-04-14 14:17 ` [PATCH 10/17] perf bench: Update manpage to mention numa and futex Jiri Olsa
2014-04-14 14:17 ` [PATCH 11/17] perf bench: Fix segfault at the end of an 'all' execution Jiri Olsa
2014-04-14 14:17 ` [PATCH 12/17] perf bench: Set more defaults in the 'numa' suite Jiri Olsa
2014-04-14 14:17 ` [PATCH 13/17] perf stat: Initialize statistics correctly Jiri Olsa
2014-04-14 14:17 ` [PATCH 14/17] perf tools: Fix metrics calculation with event qualifiers Jiri Olsa
2014-04-14 14:38 ` Ingo Molnar
2014-04-14 14:17 ` [PATCH 15/17] perf tools: Fix double free in perf test 21 (code-reading.c) Jiri Olsa
2014-04-14 14:17 ` [PATCH 16/17] perf machine: Search for modules in %s/lib/modules/%s Jiri Olsa
2014-04-14 14:17 ` [PATCH 17/17] perf tools: Instead of redirecting flex output, use -o Jiri Olsa
2014-04-14 14:42 ` [GIT PULL v3 00/17] perf/core fixes Ingo Molnar
2014-04-14 14:52 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397485061-17215-9-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox