Re: [PATCH] cpuidle / ACPI: fix potential NULL pointer dereference

[Len Brown <lenb@kernel.org>]

Applied.

thanks,
Len Brown, Intel Open Source Technology Center

On 10/07/2012 08:40 PM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> The dereference should be moved below the NULL test.
> 
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>  drivers/acpi/processor_idle.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> index 3655ab9..e8086c7 100644
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -1132,7 +1132,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
>  int acpi_processor_hotplug(struct acpi_processor *pr)
>  {
>  	int ret = 0;
> -	struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
> +	struct cpuidle_device *dev;
>  
>  	if (disabled_by_idle_boot_param())
>  		return 0;
> @@ -1147,6 +1147,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
>  	if (!pr->flags.power_setup_done)
>  		return -ENODEV;
>  
> +	dev = per_cpu(acpi_cpuidle_device, pr->id);
>  	cpuidle_pause_and_lock();
>  	cpuidle_disable_device(dev);
>  	acpi_processor_get_power_info(pr);
>