diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-03 15:27:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-17 16:26:58 +0300 |
| commit | bdb0d40507c85bee33c2a71fde7b2e857346f112 (patch) | |
| tree | c63e0a9975f44be053b045745e38ef20acf30381 | |
| parent | c95538b286efc6109c987e97a051bc7844ede802 (diff) | |
| download | linux-bdb0d40507c85bee33c2a71fde7b2e857346f112.tar.xz | |
thermal: core: Free tzp copy along with the thermal zone
commit 827a07525c099f54d3b15110408824541ec66b3c upstream.
The object pointed to by tz->tzp may still be accessed after being
freed in thermal_zone_device_unregister(), so move the freeing of it
to the point after the removal completion has been completed at which
it cannot be accessed any more.
Fixes: 3d439b1a2ad3 ("thermal/core: Alloc-copy-free the thermal zone parameters structure")
Cc: 6.8+ <stable@vger.kernel.org> # 6.8+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/4623516.LvFx2qVVIh@rjwysocki.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/thermal/thermal_core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 415341c7ed04..795be67ca878 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1647,14 +1647,12 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) ida_destroy(&tz->ida); device_del(&tz->device); - - kfree(tz->tzp); - put_device(&tz->device); thermal_notify_tz_delete(tz); wait_for_completion(&tz->removal); + kfree(tz->tzp); kfree(tz); } EXPORT_SYMBOL_GPL(thermal_zone_device_unregister); |