lkml.org 
[lkml]   [2019]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] perf tools: Call closedir to release the resource before we return
Em Thu, Oct 24, 2019 at 11:16:05PM -0400, Hewenliang escreveu:
> We should close the directory on pattern failure before the return
> of rm_rf_depth_pat.
>
> Fixes: cdb6b0235f170 ("perf tools: Add pattern name checking to rm_rf")
> Signed-off-by: Hewenliang <hewenliang4@huawei.com>

I've already applied:

commit 6080728ff8e9c9116e52e6f840152356ac2fea56
Author: Yunfeng Ye <yeyunfeng@huawei.com>
Date: Tue Oct 15 16:30:08 2019 +0800

perf tools: Fix resource leak of closedir() on the error paths

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>

[acme@quaco perf]$ git tag --contains 6080728ff8e9c9116e52e6f840152356ac2fea56
perf-urgent-for-mingo-5.4-20191017
[acme@quaco perf]$

It is already in tip/perf/urgent, should get to Linus soon.

- Arnaldo

> ---
> tools/perf/util/util.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
> index 5eda6e19c947..1aadca8c43f3 100644
> --- a/tools/perf/util/util.c
> +++ b/tools/perf/util/util.c
> @@ -154,8 +154,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))
> + if (!match_pat(d->d_name, pat)) {
> + closedir(dir);
> return -2;
> + }
>
> scnprintf(namebuf, sizeof(namebuf), "%s/%s",
> path, d->d_name);
> --
> 2.19.1

--

- Arnaldo

\
 
 \ /
  Last update: 2019-10-25 14:03    [W:0.372 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site