mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ACPI: processor: idle: Fix resource rollback in acpi_processor_power_init
@ 2025-06-19  6:13 Huisong Li
  2025-06-28  0:54 ` lihuisong (C)
  2025-07-02 17:42 ` Rafael J. Wysocki
  0 siblings, 2 replies; 9+ messages in thread
From: Huisong Li @ 2025-06-19  6:13 UTC (permalink / raw)
  To: rafael, lenb
  Cc: linux-acpi, linux-kernel, linuxarm, jonathan.cameron, zhanjie9,
	zhenglifeng1, yubowen8, liuyonglong, lihuisong

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@huawei.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)
-- 
2.33.0


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2025-07-22 11:28 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-19  6:13 [PATCH] ACPI: processor: idle: Fix resource rollback in acpi_processor_power_init Huisong Li
2025-06-28  0:54 ` lihuisong (C)
2025-07-02 17:42 ` Rafael J. Wysocki
2025-07-03  6:23   ` lihuisong (C)
2025-07-03 11:09     ` Rafael J. Wysocki
2025-07-14  1:33       ` lihuisong (C)
2025-07-22 11:05         ` lihuisong (C)
2025-07-22 11:10         ` Rafael J. Wysocki
2025-07-22 11:28           ` lihuisong (C)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®