Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210621214220.167927-1-rickyman7@gmail.com>
In-Reply-To: <20210621214220.167927-1-rickyman7@gmail.com>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Tue, 22 Jun 2021 12:52:51 -0700
Message-ID: <CAM9d7cgwTqDov1bD8FKygKkxeOY=tys8_DP3qytCmgne35BOcA@mail.gmail.com>
Subject: Re: [PATCH] perf data: close all files in close_dir
To:     Riccardo Mancini <rickyman7@gmail.com>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Ian Rogers <irogers@google.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Zhen Lei <thunder.leizhen@huawei.com>,
        linux-perf-users <linux-perf-users@vger.kernel.org>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Jun 21, 2021 at 2:42 PM Riccardo Mancini <rickyman7@gmail.com> 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 <rickyman7@gmail.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

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
>