* [PATCH] perf tools: fix resource leak of closedir() on the error paths
@ 2019-10-15 8:30 Yunfeng Ye
2019-10-15 8:44 ` Jiri Olsa
0 siblings, 1 reply; 3+ messages in thread
From: Yunfeng Ye @ 2019-10-15 8:30 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, ast, daniel, kafai, songliubraving, yhs, ilubashe, ak,
yeyunfeng, kan.liang, alexey.budankov
Cc: linux-kernel, netdev, bpf, hushiyuan, linfeilong
Both build_mem_topology() and rm_rf_depth_pat() have resource leak 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>
---
| 4 +++-
tools/perf/util/util.c | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
--git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 86d9396..becc2d1 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1296,8 +1296,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 5eda6e1..ae56c76 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))
- return -2;
+ if (!match_pat(d->d_name, pat)) {
+ ret = -2;
+ break;
+ }
scnprintf(namebuf, sizeof(namebuf), "%s/%s",
path, d->d_name);
--
2.7.4.huawei.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] perf tools: fix resource leak of closedir() on the error paths
2019-10-15 8:30 [PATCH] perf tools: fix resource leak of closedir() on the error paths Yunfeng Ye
@ 2019-10-15 8:44 ` Jiri Olsa
2019-10-15 14:58 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Olsa @ 2019-10-15 8:44 UTC (permalink / raw)
To: Yunfeng Ye
Cc: peterz, mingo, acme, mark.rutland, alexander.shishkin, namhyung,
ast, daniel, kafai, songliubraving, yhs, ilubashe, ak, kan.liang,
alexey.budankov, linux-kernel, netdev, bpf, hushiyuan,
linfeilong
On Tue, Oct 15, 2019 at 04:30:08PM +0800, Yunfeng Ye wrote:
> Both build_mem_topology() and rm_rf_depth_pat() have resource leak 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")
guilty as charged ;-)
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
> ---
> 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 86d9396..becc2d1 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1296,8 +1296,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 5eda6e1..ae56c76 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))
> - return -2;
> + if (!match_pat(d->d_name, pat)) {
> + ret = -2;
> + break;
> + }
>
> scnprintf(namebuf, sizeof(namebuf), "%s/%s",
> path, d->d_name);
> --
> 2.7.4.huawei.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] perf tools: fix resource leak of closedir() on the error paths
2019-10-15 8:44 ` Jiri Olsa
@ 2019-10-15 14:58 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-10-15 14:58 UTC (permalink / raw)
To: Jiri Olsa
Cc: Yunfeng Ye, peterz, mingo, mark.rutland, alexander.shishkin,
namhyung, ast, daniel, kafai, songliubraving, yhs, ilubashe, ak,
kan.liang, alexey.budankov, linux-kernel, netdev, bpf, hushiyuan,
linfeilong
Em Tue, Oct 15, 2019 at 10:44:51AM +0200, Jiri Olsa escreveu:
> On Tue, Oct 15, 2019 at 04:30:08PM +0800, Yunfeng Ye wrote:
> > Both build_mem_topology() and rm_rf_depth_pat() have resource leak 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")
>
> guilty as charged ;-)
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
Thanks, applied to perf/urgent.
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-15 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-15 8:30 [PATCH] perf tools: fix resource leak of closedir() on the error paths Yunfeng Ye
2019-10-15 8:44 ` Jiri Olsa
2019-10-15 14:58 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).