linux-kernel - Re: [PATCH 1/8] perf sched: Make sure it frees the usage string

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAP-5=fVXgSTGF_NALm2TfLK9+CSL2-H1QvKh5=ozveU1orBJwg@mail.gmail.com>
Date: Wed, 2 Jul 2025 20:04:59 -0700
From: Ian Rogers <irogers@...gle.com>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Arnaldo Carvalho de Melo <acme@...nel.org>, Kan Liang <kan.liang@...ux.intel.com>, 
	Jiri Olsa <jolsa@...nel.org>, Adrian Hunter <adrian.hunter@...el.com>, 
	Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...nel.org>, 
	LKML <linux-kernel@...r.kernel.org>, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH 1/8] perf sched: Make sure it frees the usage string

On Wed, Jul 2, 2025 at 6:49 PM Namhyung Kim <namhyung@...nel.org> wrote:
>
> The parse_options_subcommand() allocates the usage string based on the
> given subcommands.  So it should reach the end of the function to free
> the string to prevent memory leaks.
>
> Signed-off-by: Namhyung Kim <namhyung@...nel.org>

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

Thanks,
Ian

> ---
>  tools/perf/builtin-sched.c | 25 +++++++++++++------------
>  1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
> index 26ece6e9bfd167b3..b7bbfad0ed600eee 100644
> --- a/tools/perf/builtin-sched.c
> +++ b/tools/perf/builtin-sched.c
> @@ -3902,9 +3902,9 @@ int cmd_sched(int argc, const char **argv)
>          * Aliased to 'perf script' for now:
>          */
>         if (!strcmp(argv[0], "script")) {
> -               return cmd_script(argc, argv);
> +               ret = cmd_script(argc, argv);
>         } else if (strlen(argv[0]) > 2 && strstarts("record", argv[0])) {
> -               return __cmd_record(argc, argv);
> +               ret = __cmd_record(argc, argv);
>         } else if (strlen(argv[0]) > 2 && strstarts("latency", argv[0])) {
>                 sched.tp_handler = &lat_ops;
>                 if (argc > 1) {
> @@ -3913,7 +3913,7 @@ int cmd_sched(int argc, const char **argv)
>                                 usage_with_options(latency_usage, latency_options);
>                 }
>                 setup_sorting(&sched, latency_options, latency_usage);
> -               return perf_sched__lat(&sched);
> +               ret = perf_sched__lat(&sched);
>         } else if (!strcmp(argv[0], "map")) {
>                 if (argc) {
>                         argc = parse_options(argc, argv, map_options, map_usage, 0);
> @@ -3924,13 +3924,14 @@ int cmd_sched(int argc, const char **argv)
>                                 sched.map.task_names = strlist__new(sched.map.task_name, NULL);
>                                 if (sched.map.task_names == NULL) {
>                                         fprintf(stderr, "Failed to parse task names\n");
> -                                       return -1;
> +                                       ret = -1;
> +                                       goto out;
>                                 }
>                         }
>                 }
>                 sched.tp_handler = &map_ops;
>                 setup_sorting(&sched, latency_options, latency_usage);
> -               return perf_sched__map(&sched);
> +               ret = perf_sched__map(&sched);
>         } else if (strlen(argv[0]) > 2 && strstarts("replay", argv[0])) {
>                 sched.tp_handler = &replay_ops;
>                 if (argc) {
> @@ -3938,7 +3939,7 @@ int cmd_sched(int argc, const char **argv)
>                         if (argc)
>                                 usage_with_options(replay_usage, replay_options);
>                 }
> -               return perf_sched__replay(&sched);
> +               ret = perf_sched__replay(&sched);
>         } else if (!strcmp(argv[0], "timehist")) {
>                 if (argc) {
>                         argc = parse_options(argc, argv, timehist_options,
> @@ -3954,19 +3955,19 @@ int cmd_sched(int argc, const char **argv)
>                                 parse_options_usage(NULL, timehist_options, "w", true);
>                         if (sched.show_next)
>                                 parse_options_usage(NULL, timehist_options, "n", true);
> -                       return -EINVAL;
> +                       ret = -EINVAL;
> +                       goto out;
>                 }
>                 ret = symbol__validate_sym_arguments();
> -               if (ret)
> -                       return ret;
> -
> -               return perf_sched__timehist(&sched);
> +               if (!ret)
> +                       ret = perf_sched__timehist(&sched);
>         } else {
>                 usage_with_options(sched_usage, sched_options);
>         }
>
> +out:
>         /* free usage string allocated by parse_options_subcommand */
>         free((void *)sched_usage[0]);
>
> -       return 0;
> +       return ret;
>  }
> --
> 2.50.0.727.gbf7dc18ff4-goog
>