On Fri, 05 Aug 2016 15:22:36 +0300 Konstantin Khlebnikov <[email protected]> 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 <[email protected]> Looks good to me :) Acked-by: Masami Hiramatsu <[email protected]> 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 <[email protected]>
