From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932541AbcHITSU (ORCPT ); Tue, 9 Aug 2016 15:18:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52980 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932321AbcHITSS (ORCPT ); Tue, 9 Aug 2016 15:18:18 -0400 Date: Tue, 9 Aug 2016 12:18:10 -0700 From: tip-bot for Konstantin Khlebnikov Message-ID: Cc: linux-kernel@vger.kernel.org, khlebnikov@yandex-team.ru, mhiramat@kernel.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org Reply-To: mhiramat@kernel.org, hpa@zytor.com, khlebnikov@yandex-team.ru, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de In-Reply-To: <147039975648.715620.12985971832789032159.stgit@buzz> References: <147039975648.715620.12985971832789032159.stgit@buzz> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Fix module name matching Git-Commit-ID: cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb Gitweb: http://git.kernel.org/tip/cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb Author: Konstantin Khlebnikov AuthorDate: Fri, 5 Aug 2016 15:22:36 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 9 Aug 2016 10:48:09 -0300 perf probe: Fix module name matching If module is "module" then dso->short_name is "[module]". Substring comparing is't enough: "raid10" matches to "[raid1]". This patch also checks terminating zero in module name. Signed-off-by: Konstantin Khlebnikov Acked-by: Masami Hiramatsu Link: http://lkml.kernel.org/r/147039975648.715620.12985971832789032159.stgit@buzz Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index d5ccb65..1201f73 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -170,8 +170,10 @@ static struct map *kernel_get_module_map(const char *module) module = "kernel"; for (pos = maps__first(maps); pos; pos = map__next(pos)) { + /* short_name is "[module]" */ if (strncmp(pos->dso->short_name + 1, module, - pos->dso->short_name_len - 2) == 0) { + pos->dso->short_name_len - 2) == 0 && + module[pos->dso->short_name_len - 2] == '\0') { return pos; } }