aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Olsa <[email protected]>2020-02-10 15:32:17 +0100
committerArnaldo Carvalho de Melo <[email protected]>2020-02-11 16:41:49 -0300
commit7ce66139a99ce57caaf47b64afed5cb6ed02c5ed (patch)
treef9e5dcca63ca36259006f0d5dde1f7e67bdf4cd7
parent4a4eb6154d67f7766cc7eb74e9f1db424073e832 (diff)
perf maps: Fix map__clone() for struct kmap
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 <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> Tested-by: Ravi Bangoria <[email protected]> Tested-by: Kim Phillips <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Michael Petlan <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/map.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index f67960bedebb..cea05fc9595c 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -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);