mirror of
https://github.com/torvalds/linux.git
synced 2024-09-20 23:13:00 +00:00
ACPI: thermal: Fix acpi_thermal_unregister_thermal_zone() cleanup
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: ec23c1c462
("ACPI: thermal: Use trip point table to register thermal zones")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
f4cb34a75e
commit
4b27d5c420
|
@ -736,9 +736,9 @@ unregister_tzd:
|
|||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -1001,7 +1001,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);
|
||||
acpi_thermal_free_thermal_zone(tz);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user