From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: wangnan0@huawei.com, acme@redhat.com,
linux-kernel@vger.kernel.org, lizefan@huawei.com,
namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de,
jolsa@kernel.org, masami.hiramatsu.pt@hitachi.com,
mingo@kernel.org
Subject: [tip:perf/urgent] perf tools: Fix find_perf_probe_point_from_map( ) which incorrectly returns success
Date: Sat, 7 Nov 2015 23:31:04 -0800 [thread overview]
Message-ID: <tip-98d3b258ede2cdac31a2728543f652964e597e79@git.kernel.org> (raw)
In-Reply-To: <1446729565-27592-3-git-send-email-wangnan0@huawei.com>
Commit-ID: 98d3b258ede2cdac31a2728543f652964e597e79
Gitweb: http://git.kernel.org/tip/98d3b258ede2cdac31a2728543f652964e597e79
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Thu, 5 Nov 2015 13:19:25 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 5 Nov 2015 12:47:52 -0300
perf tools: Fix find_perf_probe_point_from_map() which incorrectly returns success
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 b51a8bf..e659c4f 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;
prev parent reply other threads:[~2015-11-08 7:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 13:19 [PATCH 0/2] perf tools: Two bugfixs related to perf probe Wang Nan
2015-11-05 13:19 ` [PATCH 1/2] perf probe: Only call probe_file__get_events() when fd is valid Wang Nan
2015-11-05 14:23 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-05 14:57 ` Arnaldo Carvalho de Melo
2015-11-05 15:07 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-05 15:58 ` 'Arnaldo Carvalho de Melo'
2015-11-06 9:50 ` [PATCH v2] perf probe: Verify parameters for two functions Wang Nan
2015-11-06 10:03 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-11 7:00 ` Wangnan (F)
2015-11-12 6:43 ` [tip:perf/urgent] perf probe: Verify parameters in " tip-bot for Wang Nan
2015-11-05 13:19 ` [PATCH 2/2] perf tools: Fix find_perf_probe_point_from_map() which incorrectly returns success Wang Nan
2015-11-05 14:08 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-05 16:00 ` acme
2015-11-06 6:28 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-06 7:12 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-06 8:30 ` Wangnan (F)
2015-11-06 9:27 ` Wangnan (F)
2015-11-06 13:43 ` Arnaldo Carvalho de Melo
2015-11-08 7:31 ` tip-bot for Wang Nan [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=tip-98d3b258ede2cdac31a2728543f652964e597e79@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
--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
Powered by JetHome