From 81ae37c58709cf1396b09e5136acfc8a0c259476 Mon Sep 17 00:00:00 2001 From: Burt P Date: Tue, 25 Jul 2017 14:33:49 -0500 Subject: device tree: fix crash when device tree is not found * check if device tree was found before add_keys() * UNKIFNULL(model) before strcmp * make UNKIFNULL() STRIFNULL() EMPIFNULL() macros more generic Signed-off-by: Burt P --- modules/devices/ia64/processor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/devices/ia64/processor.c') diff --git a/modules/devices/ia64/processor.c b/modules/devices/ia64/processor.c index cbe1bc2e..c617f096 100644 --- a/modules/devices/ia64/processor.c +++ b/modules/devices/ia64/processor.c @@ -105,12 +105,12 @@ processor_scan(void) processor = (Processor *) pi->data; /* strings can't be null or segfault later */ - STRIFNULL(model_name, _("IA64 Processor") ); - UNKIFNULL(vendor_id); - STRIFNULL(arch, "IA-64"); - STRIFNULL(archrev, "0"); - UNKIFNULL(family); - UNKIFNULL(features); + STRIFNULL(processor->model_name, _("IA64 Processor") ); + UNKIFNULL(processor->vendor_id); + STRIFNULL(processor->arch, "IA-64"); + STRIFNULL(processor->archrev, "0"); + UNKIFNULL(processor->family); + UNKIFNULL(processor->features); /* topo & freq */ processor->cpufreq = cpufreq_new(processor->id); -- cgit v1.2.3