2021-06-21 21:43:47

by Riccardo Mancini

Subject: [PATCH] perf data: close all files in close_dir

When using perf report in directory mode, the first file is not closed on
exit, causing a memory leak.
The problem is caused by the iterating variable never reaching 0.

Signed-off-by: Riccardo Mancini <[email protected]>
---
tools/perf/util/data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 8fca4779ae6a..70b91ce35178 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -20,7 +20,7 @@

static void close_dir(struct perf_data_file *files, int nr)
{
- while (--nr >= 1) {
+ while (--nr >= 0) {
close(files[nr].fd);
zfree(&files[nr].path);
}
--
2.23.0

2021-06-22 19:53:49

by Namhyung Kim

Subject: Re: [PATCH] perf data: close all files in close_dir

On Mon, Jun 21, 2021 at 2:42 PM Riccardo Mancini <[email protected]> wrote:
>
> When using perf report in directory mode, the first file is not closed on
> exit, causing a memory leak.
> The problem is caused by the iterating variable never reaching 0.
>
> Signed-off-by: Riccardo Mancini <[email protected]>

Acked-by: Namhyung Kim <[email protected]>

Thanks,
Namhyung


> ---
> tools/perf/util/data.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 8fca4779ae6a..70b91ce35178 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -20,7 +20,7 @@
>
> static void close_dir(struct perf_data_file *files, int nr)
> {
> - while (--nr >= 1) {
> + while (--nr >= 0) {
> close(files[nr].fd);
> zfree(&files[nr].path);
> }
> --
> 2.23.0
>