linux-kernel - [PATCH 2/2] perf stat: Fix a segfault with --per-cluster --metric-only

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: <20240627200353.1230407-2-namhyung@kernel.org>
Date: Thu, 27 Jun 2024 13:03:53 -0700
From: Namhyung Kim <namhyung@...nel.org>
To: Arnaldo Carvalho de Melo <acme@...nel.org>,
	Ian Rogers <irogers@...gle.com>,
	Kan Liang <kan.liang@...ux.intel.com>
Cc: 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,
	Yicong Yang <yangyicong@...ilicon.com>
Subject: [PATCH 2/2] perf stat: Fix a segfault with --per-cluster --metric-only

The new --per-cluster option was added recently but it forgot to update
the aggr_header fields which are used for --metric-only option.  And it
resulted in a segfault due to NULL string in fputs().

Fixes: cbc917a1b03b ("perf stat: Support per-cluster aggregation")
Cc: Yicong Yang <yangyicong@...ilicon.com>
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
---
 tools/perf/util/stat-display.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index e8673c9f6b49..462227f663cb 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -38,6 +38,7 @@
 static int aggr_header_lens[] = {
 	[AGGR_CORE] 	= 18,
 	[AGGR_CACHE]	= 22,
+	[AGGR_CLUSTER]	= 20,
 	[AGGR_DIE] 	= 12,
 	[AGGR_SOCKET] 	= 6,
 	[AGGR_NODE] 	= 6,
@@ -49,6 +50,7 @@ static int aggr_header_lens[] = {
 static const char *aggr_header_csv[] = {
 	[AGGR_CORE] 	= 	"core%scpus%s",
 	[AGGR_CACHE]	= 	"cache%scpus%s",
+	[AGGR_CLUSTER]	= 	"cluster%scpus%s",
 	[AGGR_DIE] 	= 	"die%scpus%s",
 	[AGGR_SOCKET] 	= 	"socket%scpus%s",
 	[AGGR_NONE] 	= 	"cpu%s",
@@ -60,6 +62,7 @@ static const char *aggr_header_csv[] = {
 static int aggr_header_num[] = {
 	[AGGR_CORE] 	= 	2,
 	[AGGR_CACHE]	= 	2,
+	[AGGR_CLUSTER]	= 	2,
 	[AGGR_DIE] 	= 	2,
 	[AGGR_SOCKET] 	= 	2,
 	[AGGR_NONE] 	= 	1,
-- 
2.45.2.803.g4e1b14247a-goog