From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932508AbcHHTfK (ORCPT ); Mon, 8 Aug 2016 15:35:10 -0400 Received: from mail.kernel.org ([198.145.29.136]:42576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932289AbcHHTfG (ORCPT ); Mon, 8 Aug 2016 15:35:06 -0400 Date: Mon, 8 Aug 2016 16:34:45 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: Konstantin Khlebnikov , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] perf probe: fix module name matching Message-ID: <20160808193445.GC3192@kernel.org> References: <147039975648.715620.12985971832789032159.stgit@buzz> <20160806193045.d12c57e9f6bf32db719cd773@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160806193045.d12c57e9f6bf32db719cd773@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sat, Aug 06, 2016 at 07:30:45PM +0900, Masami Hiramatsu escreveu: > On Fri, 05 Aug 2016 15:22:36 +0300 > Konstantin Khlebnikov wrote: > > > 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 > > Looks good to me :) > > Acked-by: Masami Hiramatsu Ok, nevermind that other message, I hadn't seen this one, thanks! > Thanks! > > > --- > > 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 953dc1ab2ed7..dd2d60ef05d3 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; > > } > > } > > > > > -- > Masami Hiramatsu