From: Namhyung Kim <namhyung@kernel.org>
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
Subject: Re: [PATCH v1 3/4] perf stat: Avoid metric-only segv
Date: Tue, 13 Feb 2024 13:45:20 -0800 [thread overview]
Message-ID: <CAM9d7ch82xZ2-tfQz641Hj0CpzadVrpp-WfaNWA5R48QJARtbg@mail.gmail.com> (raw)
In-Reply-To: <20240209204947.3873294-4-irogers@google.com>
On Fri, Feb 9, 2024 at 12:50 PM Ian Rogers <irogers@google.com> wrote:
>
> 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-display.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-display.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 += 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 = false;
> }
> --
> 2.43.0.687.g38aa6559b0-goog
>
next prev parent reply other threads:[~2024-02-13 21:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-09 20:49 [PATCH v1 0/4] Fixes/improvements to metric output Ian Rogers
2024-02-09 20:49 ` [PATCH v1 1/4] perf expr: Allow NaN to be a valid number Ian Rogers
2024-02-09 20:49 ` [PATCH v1 2/4] perf expr: Fix "has_event" function for metric style events Ian Rogers
2024-02-09 20:49 ` [PATCH v1 3/4] perf stat: Avoid metric-only segv Ian Rogers
2024-02-13 21:45 ` Namhyung Kim [this message]
2024-02-09 20:49 ` [PATCH v1 4/4] perf metric: Don't remove scale from counts Ian Rogers
2024-02-13 14:28 ` [PATCH v1 0/4] Fixes/improvements to metric output Liang, Kan
2024-02-14 19:07 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAM9d7ch82xZ2-tfQz641Hj0CpzadVrpp-WfaNWA5R48QJARtbg@mail.gmail.com \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kprateek.nayak@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=ye@kaige.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).