diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2016-08-05 08:22:36 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-08-09 09:48:09 -0400 |
commit | cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb (patch) | |
tree | c484ff0676fe81b0a85b2645bcfbe93cc716cf86 /tools/perf | |
parent | 8e34189b347d76acf48ce05831176582201b664d (diff) |
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 <khlebnikov@yandex-team.ru>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Link: http://lkml.kernel.org/r/147039975648.715620.12985971832789032159.stgit@buzz
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/util/probe-event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index d5ccb656fd81..1201f73ca723 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) | |||
170 | module = "kernel"; | 170 | module = "kernel"; |
171 | 171 | ||
172 | for (pos = maps__first(maps); pos; pos = map__next(pos)) { | 172 | for (pos = maps__first(maps); pos; pos = map__next(pos)) { |
173 | /* short_name is "[module]" */ | ||
173 | if (strncmp(pos->dso->short_name + 1, module, | 174 | if (strncmp(pos->dso->short_name + 1, module, |
174 | pos->dso->short_name_len - 2) == 0) { | 175 | pos->dso->short_name_len - 2) == 0 && |
176 | module[pos->dso->short_name_len - 2] == '\0') { | ||
175 | return pos; | 177 | return pos; |
176 | } | 178 | } |
177 | } | 179 | } |