Received-SPF: pass (google.com: domain of linux-kernel+bounces-174167-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240509052015.1914670-1-irogers@google.com>
In-Reply-To: <20240509052015.1914670-1-irogers@google.com>
From: Ian Rogers <irogers@google.com>
Date: Wed, 8 May 2024 22:34:33 -0700
Message-ID: <CAP-5=fW=qV=ZdU5qpfXE_E0+tU_kmcVeGC6M38nbm+Px=2aWPw@mail.gmail.com>
Subject: Re: [PATCH v1] libsubcmd: Fix parse-options memory leak
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
	Arnaldo Carvalho de Melo <acme@kernel.org>, Namhyung Kim <namhyung@kernel.org>, 
	Mark Rutland <mark.rutland@arm.com>, 
	Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, 
	Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, 
	Kan Liang <kan.liang@linux.intel.com>, linux-kernel@vger.kernel.org, 
	linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, May 8, 2024 at 10:20=E2=80=AFPM Ian Rogers <irogers@google.com> wro=
te:
>
> If a usage string is built in parse_options_subcommand, also free it.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Sorry, belated:
Fixes: 901421a5bdf6 ("perf tools: Remove subcmd dependencies on strbuf")

Thanks,
Ian

> ---
>  tools/lib/subcmd/parse-options.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-op=
tions.c
> index 9fa75943f2ed..d943d78b787e 100644
> --- a/tools/lib/subcmd/parse-options.c
> +++ b/tools/lib/subcmd/parse-options.c
> @@ -633,11 +633,10 @@ int parse_options_subcommand(int argc, const char *=
*argv, const struct option *o
>                         const char *const subcommands[], const char *usag=
estr[], int flags)
>  {
>         struct parse_opt_ctx_t ctx;
> +       char *buf =3D NULL;
>
>         /* build usage string if it's not provided */
>         if (subcommands && !usagestr[0]) {
> -               char *buf =3D NULL;
> -
>                 astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_=
name, argv[0]);
>
>                 for (int i =3D 0; subcommands[i]; i++) {
> @@ -679,7 +678,10 @@ int parse_options_subcommand(int argc, const char **=
argv, const struct option *o
>                         astrcatf(&error_buf, "unknown switch `%c'", *ctx.=
opt);
>                 usage_with_options(usagestr, options);
>         }
> -
> +       if (buf) {
> +               usagestr[0] =3D NULL;
> +               free(buf);
> +       }
>         return parse_options_end(&ctx);
>  }
>
> --
> 2.45.0.rc1.225.g2a3ae87e7f-goog
>