summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChangbin Du <changbin.du@gmail.com>2019-03-16 16:05:50 +0800
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-03-19 16:52:05 -0300
commitb49265e04410b97b31a5ee66ef6782c1b2d6cd2c (patch)
treeee2ca788da5a82e8b3778da1175df7182f2d1d48 /tools
parentcb6186aeffda4d27e56066c79e9579e7831541d3 (diff)
downloadlinux-b49265e04410b97b31a5ee66ef6782c1b2d6cd2c.tar.bz2
perf map: Remove map from 'names' tree in __maps__remove()
There are two trees for each map inserted by maps__insert(), so remove it from the 'names' tree in __maps__remove(). Detected with gcc's ASan. Signed-off-by: Changbin Du <changbin.du@gmail.com> Reviewed-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Eric Saint-Etienne <eric.saint.etienne@oracle.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Fixes: 1e6285699b30 ("perf symbols: Fix slowness due to -ffunction-section") Link: http://lkml.kernel.org/r/20190316080556.3075-11-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/map.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index fbeb0c6efaa6..64bea5eb8bf6 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -917,6 +917,9 @@ static void __maps__remove(struct maps *maps, struct map *map)
{
rb_erase_init(&map->rb_node, &maps->entries);
map__put(map);
+
+ rb_erase_init(&map->rb_node_name, &maps->names);
+ map__put(map);
}
void maps__remove(struct maps *maps, struct map *map)