perf maps: Fix map__clone() for struct kmap
authorJiri Olsa <jolsa@kernel.org>
Mon, 10 Feb 2020 14:32:17 +0000 (15:32 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 11 Feb 2020 19:41:49 +0000 (16:41 -0300)
The map__clone() function can be called on kernel maps as well, so it
needs to duplicate the whole kmap data.

Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: Kim Phillips <kim.phillips@amd.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200210143218.24948-4-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/map.c

index f67960b..cea05fc 100644 (file)
@@ -375,8 +375,13 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name)
 
 struct map *map__clone(struct map *from)
 {
-       struct map *map = memdup(from, sizeof(*map));
+       size_t size = sizeof(struct map);
+       struct map *map;
+
+       if (from->dso && from->dso->kernel)
+               size += sizeof(struct kmap);
 
+       map = memdup(from, size);
        if (map != NULL) {
                refcount_set(&map->refcnt, 1);
                RB_CLEAR_NODE(&map->rb_node);