[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <99e8badc-cd1d-4a8f-a56d-6c534a18ab0f@huawei.com>
Date: Sat, 28 Jun 2025 08:54:34 +0800
From: "lihuisong (C)" <lihuisong@...wei.com>
To: <rafael@...nel.org>, <lenb@...nel.org>
CC: <linux-acpi@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linuxarm@...wei.com>, <jonathan.cameron@...wei.com>,
<zhanjie9@...ilicon.com>, <zhenglifeng1@...wei.com>, <yubowen8@...wei.com>,
<liuyonglong@...wei.com>
Subject: Re: [PATCH] ACPI: processor: idle: Fix resource rollback in
acpi_processor_power_init
Kindly ping for review.
在 2025/6/19 14:13, Huisong Li 写道:
> There are two resource rollback issues in acpi_processor_power_init:
> 1> Do not unregister acpi_idle_driver when do kzalloc failed.
> 2> Do not free cpuidle device memory when register cpuidle device failed.
>
> Signed-off-by: Huisong Li <lihuisong@...wei.com>
> ---
> drivers/acpi/processor_idle.c | 24 +++++++++++++++++-------
> 1 file changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> index 2c2dc559e0f8..3548ab9dac9e 100644
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -1392,8 +1392,10 @@ int acpi_processor_power_init(struct acpi_processor *pr)
> }
>
> dev = kzalloc(sizeof(*dev), GFP_KERNEL);
> - if (!dev)
> - return -ENOMEM;
> + if (!dev) {
> + retval = -ENOMEM;
> + goto unregister_driver;
> + }
> per_cpu(acpi_cpuidle_device, pr->id) = dev;
>
> acpi_processor_setup_cpuidle_dev(pr, dev);
> @@ -1402,14 +1404,22 @@ int acpi_processor_power_init(struct acpi_processor *pr)
> * must already be registered before registering device
> */
> retval = cpuidle_register_device(dev);
> - if (retval) {
> - if (acpi_processor_registered == 0)
> - cpuidle_unregister_driver(&acpi_idle_driver);
> - return retval;
> - }
> + if (retval)
> + goto free_cpuidle_device;
> +
> acpi_processor_registered++;
> }
> return 0;
> +
> +free_cpuidle_device:
> + per_cpu(acpi_cpuidle_device, pr->id) = NULL;
> + kfree(dev);
> +
> +unregister_driver:
> + if (acpi_processor_registered == 0)
> + cpuidle_unregister_driver(&acpi_idle_driver);
> +
> + return retval;
> }
>
> int acpi_processor_power_exit(struct acpi_processor *pr)
Powered by blists - more mailing lists