Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230427230502.1526136-1-namhyung@kernel.org>
In-Reply-To: <20230427230502.1526136-1-namhyung@kernel.org>
From:   Ian Rogers <irogers@google.com>
Date:   Thu, 27 Apr 2023 17:27:50 -0700
Message-ID: <CAP-5=fUYfVDfi_+JGqU=o_TcPRNVboMwZewuhU6q+K3md6nUkA@mail.gmail.com>
Subject: Re: [PATCH 1/2] perf list: Fix memory leaks in print_tracepoint_events()
To:     Namhyung Kim <namhyung@kernel.org>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Apr 27, 2023 at 4:05=E2=80=AFPM Namhyung Kim <namhyung@kernel.org> =
wrote:
>
> It should free entries (not only the array) filled by scandirat()
> after use.
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/util/print-events.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-event=
s.c
> index d416c5484cd5..0a97912fd894 100644
> --- a/tools/perf/util/print-events.c
> +++ b/tools/perf/util/print-events.c
> @@ -83,11 +83,11 @@ void print_tracepoint_events(const struct print_callb=
acks *print_cb __maybe_unus
>                 if (sys_dirent->d_type !=3D DT_DIR ||
>                     !strcmp(sys_dirent->d_name, ".") ||
>                     !strcmp(sys_dirent->d_name, ".."))
> -                       continue;
> +                       goto next_sys;
>
>                 dir_fd =3D openat(events_fd, sys_dirent->d_name, O_PATH);
>                 if (dir_fd < 0)
> -                       continue;
> +                       goto next_sys;
>
>                 evt_items =3D scandirat(events_fd, sys_dirent->d_name, &e=
vt_namelist, NULL, alphasort);
>                 for (int j =3D 0; j < evt_items; j++) {
> @@ -98,12 +98,12 @@ void print_tracepoint_events(const struct print_callb=
acks *print_cb __maybe_unus
>                         if (evt_dirent->d_type !=3D DT_DIR ||
>                             !strcmp(evt_dirent->d_name, ".") ||
>                             !strcmp(evt_dirent->d_name, ".."))
> -                               continue;
> +                               goto next_evt;
>
>                         snprintf(evt_path, sizeof(evt_path), "%s/id", evt=
_dirent->d_name);
>                         evt_fd =3D openat(dir_fd, evt_path, O_RDONLY);
>                         if (evt_fd < 0)
> -                               continue;
> +                               goto next_evt;
>                         close(evt_fd);
>
>                         snprintf(evt_path, MAXPATHLEN, "%s:%s",
> @@ -119,9 +119,13 @@ void print_tracepoint_events(const struct print_call=
backs *print_cb __maybe_unus
>                                         /*desc=3D*/NULL,
>                                         /*long_desc=3D*/NULL,
>                                         /*encoding_desc=3D*/NULL);
> +next_evt:
> +                       free(evt_namelist[j]);
>                 }
>                 close(dir_fd);
>                 free(evt_namelist);
> +next_sys:
> +               free(sys_namelist[i]);
>         }
>
>         free(sys_namelist);
> --
> 2.40.1.495.gc816e09b53d-goog
>