Received-SPF: pass (google.com: domain of linux-kernel+bounces-24134-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: 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>,
	Namhyung Kim <namhyung@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] perf data convert: Fix segfault when converting to json on arm64
Date: Thu, 11 Jan 2024 15:29:23 -0800
Message-ID: <20240111232923.8138-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?G4JydZ3o4TJquqA393XNaTq9KjmwNq+JWOhVS3B9M7FKqsiavjlddgYyOkpk?=
 =?us-ascii?Q?YTvEQf+gziz28NNfMXkJRFvpGIFtbjgSyK1ILpeXdbg5RHW4+peXT3z67GAB?=
 =?us-ascii?Q?1InQ+oIG3mG4mHDME51C0AJI3ZX/KJQU4pU8/mt1bL/liLdadGMKTr0dgafg?=
 =?us-ascii?Q?yRJQ4+AK+w6zARUzj9eEmgYRxF2TXEBkXXjCN5jrbm4M55tQef/sWJpLCib7?=
 =?us-ascii?Q?EpPsGCtQKBtz1AztVSbPG/4JQK8jeuz09xlU2j2kW78vnOtgflxE/ZkFE86H?=
 =?us-ascii?Q?mJtLnR2flSqzftoi4oOPCSz/KkTuqE6mLZEP6HUbaW76Ix02gboG1fmjfVye?=
 =?us-ascii?Q?Wzib1qtGvjJSj4pQhJXFV+Wg/i4W76x38DkcGx4m1ZEfIsZsYOsE4enofm0c?=
 =?us-ascii?Q?0RBzSRjvR3P24wBsE9EJ2of3SX8Jr4VDROAVDi2sr0RtplHo0zhpe06om6By?=
 =?us-ascii?Q?g5DSbX3YoAwhfsnejfpKyMZf33h1DoaA7uiC0qR1uhyjWtX67cVQeVnc0COm?=
 =?us-ascii?Q?KOL9jVkSKLFqMqrg+C5sU1r7yo/6+aPwKsro1hmWx4gVzURSeQDfWPbUU9v6?=
 =?us-ascii?Q?b6314XcEMC758zuBnChahaVegNz/e+EugZxU4zBj45g/pJPBhJGrD3MD9U88?=
 =?us-ascii?Q?P6lqB74+P9/sP0+F9wMeXTIXX0Ap91tpo4Q6skW5QRhE/UR84q05bcOiA3Hk?=
 =?us-ascii?Q?azOR4KOW313K/qg8FoZ9zBjAOOlKNioLf1toe+8Eda9vGrbodV5r6BAL4mZw?=
 =?us-ascii?Q?k6DAQLv595x6NB7DjkIkBzWrAtG6zb7SgOqKO27RX56qTW5d7BXAM32UAtoH?=
 =?us-ascii?Q?DHEGbOZiELvO8H/uCVFBnICWEr1JOK455U/Dkw2Zv7SJMW91fFzT+GhCqOA6?=
 =?us-ascii?Q?daQYLB+8wKm+SP8f1Ulju2YutEtYQMT6Y0PtmqAHPhf4ZhF/uPMXDg1v59LP?=
 =?us-ascii?Q?HoVXAxOoMFklpSI9MFnq6agyX1Wo/94lIiiGYnXwx48Ujv7NgjeTJzomXEpA?=
 =?us-ascii?Q?cK7mk7c/3Sfq/4vg1pmYIuJNq/7rThr9sAZCqfWDk7PSrvG3iNV7sOv6thVs?=
 =?us-ascii?Q?+qPy8q+s53EQJzUSRMoCxcHUePCTbyihx5dA1aOq2giy6Dgr6M5ojuubsK6P?=
 =?us-ascii?Q?jm73VKRMbWyqJrG1VLa1+XDgbBaRVMWAdi+lFPBIgi3wWIsuiufGWzAvVSw7?=
 =?us-ascii?Q?p3aI5zg9azKcax2pQnJtd0A6wfrMKOMFFhMeIXk0u8OUmLBvEe55v4qvyk05?=
 =?us-ascii?Q?MXP9k592ghvrioIjVsgvcL40pYPJ13GymDlMU2NFBzUM1OMGA88m6cbhmbtX?=
 =?us-ascii?Q?S/qt5B/IrxjSm1TpTLlTX/Pm8GnpZFjqdUdlXKA4D0wBGyzsTFqOSVk+d9TX?=
 =?us-ascii?Q?rWZuOSRaKxE/C8Iugh2ZuyTeVJanSSjIGLokFa5DztAQBmELmetrdxfK3JD3?=
 =?us-ascii?Q?9/YXZfQe+j8xcYM4B/mTKhuXMCqSkPVATokexXHBeCxQuEDAYeDw5xBmwan8?=
 =?us-ascii?Q?s1ie6R0iyPmaK9AMjdV4rJ7wmM5KSvEvm84EhX7ZLoKvSX8kTU6bh6pLEdpj?=
 =?us-ascii?Q?T2Az4aLg6AgSLF1ZyG4Y+nqnChGtt3vLchkaSMf/SKrAOjOyQw3b9V/hAs0R?=
 =?us-ascii?Q?acNNEhWctvNd3CAf0eyUS+I=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 400567c1-9668-46e2-e4f8-08dc12fd36d6
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB8166.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 23:29:53.7921
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: bJ/C7V2+2LuOjgCCDbb8OfPaLkFHMMdDtrj4u/sGhpkvkF6HVpj51Cv/WMaudHxSlkKvEiy0kQsK+vNBvC4DCMAXAaUyadSPiD+Nuyquqj1dod7XBD4g0W+tvd7OYIl5
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR01MB6375

Arm64 doesn't have Model in /proc/cpuinfo and, thus, cpu_desc doesn't get
assigned.

Running
	$ perf data convert --to-json perf.data.json

ends up calling output_json_string() with NULL pointer, which causes a
segmentation fault.

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---
 tools/perf/util/data-convert-json.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index 5bb3c2ba95ca..5d6de1cef546 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -97,6 +97,11 @@ static void output_json_format(FILE *out, bool comma, int depth, const char *for
 static void output_json_key_string(FILE *out, bool comma, int depth,
 		const char *key, const char *value)
 {
+	if (!value) {
+		pr_info("No value set for key %s\n", key);
+		return;
+	}
+
 	output_json_delimiters(out, comma, depth);
 	output_json_string(out, key);
 	fputs(": ", out);
-- 
2.43.0