perf inject: Call dso__put() even if dso->hit is set
authorNamhyung Kim <namhyung@kernel.org>
Mon, 24 May 2021 22:50:50 +0000 (15:50 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 26 May 2021 12:36:45 +0000 (09:36 -0300)
Otherwise it'll leak the refcount for the DSO.  As dso__put() can
handle a NULL dso pointer, we can just call it unconditionally.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210524225051.1190486-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-inject.c

index 102cafb..8bbaa46 100644 (file)
@@ -383,8 +383,8 @@ static int perf_event__repipe_buildid_mmap(struct perf_tool *tool,
        if (dso && !dso->hit) {
                dso->hit = 1;
                dso__inject_build_id(dso, tool, machine, sample->cpumode, 0);
-               dso__put(dso);
        }
+       dso__put(dso);
 
        return perf_event__repipe(tool, event, sample, machine);
 }
@@ -447,8 +447,8 @@ static int perf_event__repipe_buildid_mmap2(struct perf_tool *tool,
                dso->hit = 1;
                dso__inject_build_id(dso, tool, machine, sample->cpumode,
                                     event->mmap2.flags);
-               dso__put(dso);
        }
+       dso__put(dso);
 
        perf_event__repipe(tool, event, sample, machine);