From: Dan Carpenter Date: Tue, 31 Oct 2023 09:53:06 +0000 (+0300) Subject: ACPI: thermal: Fix acpi_thermal_unregister_thermal_zone() cleanup X-Git-Tag: v6.6.17~1567 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17f449600a98a18709e7f1c85546523d07480b79;p=platform%2Fkernel%2Flinux-rpi.git ACPI: thermal: Fix acpi_thermal_unregister_thermal_zone() cleanup [ Upstream commit 4b27d5c420335dad7aea1aa6e799fe1d05c63b7e ] The acpi_thermal_unregister_thermal_zone() is paired with acpi_thermal_register_thermal_zone() so it should mirror it. It should clean up all the resources that the register function allocated and leave the stuff that was allocated elsewhere. Unfortunately, it doesn't call thermal_zone_device_disable(). Also it calls kfree(tz->trip_table) when it shouldn't. That was allocated in acpi_thermal_add(). Putting the kfree() here leads to a double free in the acpi_thermal_add() clean up function. Likewise, the acpi_thermal_remove() should mirror acpi_thermal_add() so it should have an explicit kfree(tz->trip_table) as well. Fixes: ec23c1c462de ("ACPI: thermal: Use trip point table to register thermal zones") Signed-off-by: Dan Carpenter Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 312730f..8263508 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -778,9 +778,9 @@ free_trip_table: static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz) { + thermal_zone_device_disable(tz->thermal_zone); acpi_thermal_zone_sysfs_remove(tz); thermal_zone_device_unregister(tz->thermal_zone); - kfree(tz->trip_table); tz->thermal_zone = NULL; } @@ -985,7 +985,7 @@ static void acpi_thermal_remove(struct acpi_device *device) flush_workqueue(acpi_thermal_pm_queue); acpi_thermal_unregister_thermal_zone(tz); - + kfree(tz->trip_table); kfree(tz); }