From: Jan Beulich Date: Thu, 2 Aug 2018 10:12:07 +0000 (+0200) Subject: x86/cpuidle: replace a pointless NULL check X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3512 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68465944c81fa2fbc40bf29ec6084072af5e48ec;p=xen.git x86/cpuidle: replace a pointless NULL check The address of an array slot can't be NULL. Instead add a bounds check to make sure the array indexing is valid (the check is against 2 since slot zero of the array - corresponding to C0 - is of no interest here). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f26d694362..14b02789c5 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -759,11 +759,11 @@ void acpi_dead_idle(void) struct acpi_processor_power *power; struct acpi_processor_cx *cx; - if ( (power = processor_powers[smp_processor_id()]) == NULL ) + if ( (power = processor_powers[smp_processor_id()]) == NULL || + power->count < 2 ) goto default_halt; - if ( (cx = &power->states[power->count-1]) == NULL ) - goto default_halt; + cx = &power->states[power->count - 1]; if ( cx->entry_method == ACPI_CSTATE_EM_FFH ) {