lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 056/223] perf dso: Fix memory leak in dso__new_map()
    Date
    From: Riccardo Mancini <rickyman7@gmail.com>

    [ Upstream commit 581e295a0f6b5c2931d280259fbbfff56959faa9 ]

    ASan reports a memory leak when running:

    # perf test "65: maps__merge_in".

    The causes of the leaks are two, this patch addresses only the first
    one, which is related to dso__new_map().

    The bug is that dso__new_map() creates a new dso but never decreases the
    refcount it gets from creating it.

    This patch adds the missing dso__put().

    Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
    Fixes: d3a7c489c7fd2463 ("perf tools: Reference count struct dso")
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lore.kernel.org/lkml/60bfe0cd06e89e2ca33646eb8468d7f5de2ee597.1626343282.git.rickyman7@gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/util/dso.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index d786cf6b0cfa..ee15db2be2f4 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -1154,8 +1154,10 @@ struct map *dso__new_map(const char *name)
    struct map *map = NULL;
    struct dso *dso = dso__new(name);

    - if (dso)
    + if (dso) {
    map = map__new2(0, dso);
    + dso__put(dso);
    + }

    return map;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-26 18:32    [W:5.961 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site