]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
perf maps: Add missing unlock to maps__insert() error case
authorCengiz Can <cengiz@kernel.wtf>
Mon, 20 Jan 2020 14:15:54 +0000 (17:15 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 31 Jan 2020 08:40:50 +0000 (09:40 +0100)
`tools/perf/util/map.c` has a function named `maps__insert` that
acquires a write lock if its in multithread context.

Even though this lock is released when function successfully completes,
there's a branch that is executed when `maps_by_name == NULL` that
returns from this function without releasing the write lock.

Added an `up_write` to release the lock when this happens.

Fixes: a7c2b572e217 ("perf map_groups: Auto sort maps by name, if needed")
Signed-off-by: Cengiz Can <cengiz@kernel.wtf>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20200120141553.23934-1-cengiz@kernel.wtf
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/map.c

index fdd5bddb30756be1dce1d96cbf74fcc44e718644..f67960bedebba63663f573f28df9f746aa106910 100644 (file)
@@ -549,6 +549,7 @@ void maps__insert(struct maps *maps, struct map *map)
 
                        if (maps_by_name == NULL) {
                                __maps__free_maps_by_name(maps);
+                               up_write(&maps->lock);
                                return;
                        }