Received-SPF: pass (google.com: domain of linux-kernel+bounces-64370-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240209204947.3873294-1-irogers@google.com> <20240209204947.3873294-4-irogers@google.com>
In-Reply-To: <20240209204947.3873294-4-irogers@google.com>
From: Namhyung Kim <namhyung@kernel.org>
Date: Tue, 13 Feb 2024 13:45:20 -0800
Message-ID: <CAM9d7ch82xZ2-tfQz641Hj0CpzadVrpp-WfaNWA5R48QJARtbg@mail.gmail.com>
Subject: Re: [PATCH v1 3/4] perf stat: Avoid metric-only segv
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
	Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, 
	Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, 
	Adrian Hunter <adrian.hunter@intel.com>, John Garry <john.g.garry@oracle.com>, 
	Kan Liang <kan.liang@linux.intel.com>, James Clark <james.clark@arm.com>, 
	K Prateek Nayak <kprateek.nayak@amd.com>, Kaige Ye <ye@kaige.org>, linux-perf-users@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Feb 9, 2024 at 12:50=E2=80=AFPM Ian Rogers <irogers@google.com> wro=
te:
>
> Cycles is recognized as part of a hard coded metric in stat-shadow.c,
> it may call print_metric_only with a NULL fmt string leading to a
> segfault. Handle the NULL fmt explicitly.
>
> Fixes: 088519f318be ("perf stat: Move the display functions to stat-displ=
ay.c")
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> Note, the fixes tag is to a refactor that moved the function. The bug
> existed before this.

Yeah I noticed that.

> ---
>  tools/perf/util/stat-display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-displa=
y.c
> index 8c61f8627ebc..b7d00a538d70 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -560,7 +560,7 @@ static void print_metric_only(struct perf_stat_config=
 *config,
>         if (color)
>                 mlen +=3D strlen(color) + sizeof(PERF_COLOR_RESET) - 1;
>
> -       color_snprintf(str, sizeof(str), color ?: "", fmt, val);
> +       color_snprintf(str, sizeof(str), color ?: "", fmt ?: "", val);

I was thinking about fixing the callers to pass valid format strings
but it seems they don't care about the output string anyway so
I think it's fine.

Thanks,
Namhyung


>         fprintf(out, "%*s ", mlen, str);
>         os->first =3D false;
>  }
> --
> 2.43.0.687.g38aa6559b0-goog
>