perf annotate: Fix segfault on sample histogram
authorNamhyung Kim <namhyung@kernel.org>
Fri, 10 May 2024 21:04:51 +0000 (14:04 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 11 May 2024 16:03:13 +0000 (13:03 -0300)
A symbol can have no samples, then accessing the annotated_source->samples
hashmap will result in a segfault.

Fixes: a3f7768bcf48281d ("perf annotate: Fix memory leak in annotated_source")
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240510210452.2449944-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/annotate.c

index 541988cf6e1917f54a951928d754f51173ac7e6d..1451caf25e777cf381d9e7fe75c78bfd8683b264 100644 (file)
@@ -113,10 +113,11 @@ static __maybe_unused void annotated_source__delete(struct annotated_source *src
        if (src == NULL)
                return;
 
-       hashmap__for_each_entry(src->samples, cur, bkt)
-               zfree(&cur->pvalue);
-
-       hashmap__free(src->samples);
+       if (src->samples) {
+               hashmap__for_each_entry(src->samples, cur, bkt)
+                       zfree(&cur->pvalue);
+               hashmap__free(src->samples);
+       }
        zfree(&src->histograms);
        free(src);
 }