Commit 719e17c8 authored by Ilkka Koskinen's avatar Ilkka Koskinen Committed by SuperSix173
Browse files

perf data convert: Fix segfault when converting to json when cpu_desc isn't set 

mainline inclusion
from mainline-v6.9-rc1
commit bae4d1f86e4d6750d2fc11e040c7d49b180c4b8d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9IEXU
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=bae4d1f86e4d6750d2fc11e040c7d49b180c4b8d



------------------------------------------------------

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: default avatarIlkka Koskinen <ilkka@os.amperecomputing.com>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarLiu Chao <liuchao173@huawei.com>
Cc: James Clark <james.clark@arm.com>
Cc: Evgeny Pistun <kotborealis@awooo.ru>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240223220458.15282-1-ilkka@os.amperecomputing.com
parent d9d2e017

tools/perf/util/data-convert-json.c

+3 −1
Original line number Diff line number Diff line
@@ -284,7 +284,9 @@ static void output_headers(struct perf_session *session, struct convert_json *c) 
	output_json_key_string(out, true, 2, "os-release", header->env.os_release);

	output_json_key_string(out, true, 2, "arch", header->env.arch);



	if (header->env.cpu_desc)

		output_json_key_string(out, true, 2, "cpu-desc", header->env.cpu_desc);



	output_json_key_string(out, true, 2, "cpuid", header->env.cpuid);

	output_json_key_format(out, true, 2, "nrcpus-online", "%u", header->env.nr_cpus_online);

	output_json_key_format(out, true, 2, "nrcpus-avail", "%u", header->env.nr_cpus_avail);