From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
Jiri Olsa <jolsa@kernel.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>, Zefan Li <lizefan@huawei.com>,
pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 12/12] perf tools: Fix find_perf_probe_point_from_map() which incorrectly returns success
Date: Thu, 5 Nov 2015 13:02:22 -0300 [thread overview]
Message-ID: <1446739342-29279-13-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1446739342-29279-1-git-send-email-acme@kernel.org>
From: Wang Nan <wangnan0@huawei.com>
It is possible that find_perf_probe_point_from_map() fails to find a
symbol but still returns 0 because of an small error when coding:
find_perf_probe_point_from_map() set 'ret' to error code at first, but
also use it to hold return value of kernel_get_symbol_address_by_name().
This patch resets 'ret' to error even kernel_get_symbol_address_by_name()
success, so if !sym, the whole function returns error correctly.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1446729565-27592-3-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index b51a8bfb40f9..e659c4faddec 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1905,6 +1905,9 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
sym = __find_kernel_function(addr, &map);
}
}
+
+ /* ret may has be overwritten so reset it */
+ ret = -ENOENT;
if (!sym)
goto out;
--
2.1.0
prev parent reply other threads:[~2015-11-05 16:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 16:02 [GIT PULL 00/12] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 01/12] perf test: Keep test result clean if '-v' not set Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 02/12] perf bpf: Mute libbpf when " Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 03/12] tools lib bpf: Fix compiler warning on CentOS 6 Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 04/12] perf stat: Move sw clock metrics printout to stat-shadow Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 05/12] perf stat: Use common printout function to avoid duplicated code Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 06/12] perf tools: Insert split maps correctly into origin group Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 07/12] perf tools: Allow shuffling the build tests Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 08/12] perf llvm: Pass available CPU number to clang compiler Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 09/12] perf llvm: Pass LINUX_VERSION_CODE to BPF program when compiling Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 10/12] tools lib bpf: Change FEATURE-DUMP to FEATURE-DUMP.libbpf Arnaldo Carvalho de Melo
2015-11-05 16:02 ` [PATCH 11/12] perf trace: Fix documentation for -i Arnaldo Carvalho de Melo
2015-11-05 16:02 ` Arnaldo Carvalho de Melo [this message]
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=1446739342-29279-13-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=pi3orama@163.com \
--cc=wangnan0@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).