lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 049/140] perf tools: Fix resource leak of closedir() on the error paths
    Date
    From: Yunfeng Ye <yeyunfeng@huawei.com>

    [ Upstream commit 6080728ff8e9c9116e52e6f840152356ac2fea56 ]

    Both build_mem_topology() and rm_rf_depth_pat() have resource leaks of
    closedir() on the error paths.

    Fix this by calling closedir() before function returns.

    Fixes: e2091cedd51b ("perf tools: Add MEM_TOPOLOGY feature to perf data file")
    Fixes: cdb6b0235f17 ("perf tools: Add pattern name checking to rm_rf")
    Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
    Acked-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Feilong Lin <linfeilong@huawei.com>
    Cc: Hu Shiyuan <hushiyuan@huawei.com>
    Cc: Igor Lubashev <ilubashe@akamai.com>
    Cc: Kan Liang <kan.liang@linux.intel.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Martin KaFai Lau <kafai@fb.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Song Liu <songliubraving@fb.com>
    Cc: Yonghong Song <yhs@fb.com>
    Link: http://lore.kernel.org/lkml/cd5f7cd2-b80d-6add-20a1-32f4f43e0744@huawei.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/util/header.c | 4 +++-
    tools/perf/util/util.c | 6 ++++--
    2 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
    index e95a2a26c40a8..277cdf1fc5ac8 100644
    --- a/tools/perf/util/header.c
    +++ b/tools/perf/util/header.c
    @@ -1282,8 +1282,10 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
    continue;

    if (WARN_ONCE(cnt >= size,
    - "failed to write MEM_TOPOLOGY, way too many nodes\n"))
    + "failed to write MEM_TOPOLOGY, way too many nodes\n")) {
    + closedir(dir);
    return -1;
    + }

    ret = memory_node__read(&nodes[cnt++], idx);
    }
    diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
    index a61535cf1bca2..d0930c38e147e 100644
    --- a/tools/perf/util/util.c
    +++ b/tools/perf/util/util.c
    @@ -176,8 +176,10 @@ static int rm_rf_depth_pat(const char *path, int depth, const char **pat)
    if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
    continue;

    - if (!match_pat(d->d_name, pat))
    - return -2;
    + if (!match_pat(d->d_name, pat)) {
    + ret = -2;
    + break;
    + }

    scnprintf(namebuf, sizeof(namebuf), "%s/%s",
    path, d->d_name);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-08 20:16    [W:4.332 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site