summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-04-25 19:52:12 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-04-26 11:11:00 +0200
commit72c1afffa4c645fe0e0f1c03e5f34395ed65b5f4 (patch)
treefd917dc4b67e8f3c5d8b100a2b16ef91a6bf62c7 /drivers
parented30a4a51bb196781c8058073ea720133a65596f (diff)
downloadlinux-stable-72c1afffa4c645fe0e0f1c03e5f34395ed65b5f4.tar.gz
linux-stable-72c1afffa4c645fe0e0f1c03e5f34395ed65b5f4.tar.bz2
linux-stable-72c1afffa4c645fe0e0f1c03e5f34395ed65b5f4.zip
thermal/debugfs: Free all thermal zone debug memory on zone removal
Because thermal_debug_tz_remove() does not free all memory allocated for thermal zone diagnostics, some of that memory becomes unreachable after freeing the thermal zone's struct thermal_debugfs object. Address this by making thermal_debug_tz_remove() free all of the memory in question. Fixes: 7ef01f228c9f ("thermal/debugfs: Add thermal debugfs information for mitigation episodes") 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thermal/thermal_debugfs.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index d78d54ae2605..8d66b3a96be1 100644
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -826,15 +826,28 @@ void thermal_debug_tz_add(struct thermal_zone_device *tz)
void thermal_debug_tz_remove(struct thermal_zone_device *tz)
{
struct thermal_debugfs *thermal_dbg = tz->debugfs;
+ struct tz_episode *tze, *tmp;
+ struct tz_debugfs *tz_dbg;
+ int *trips_crossed;
if (!thermal_dbg)
return;
+ tz_dbg = &thermal_dbg->tz_dbg;
+
mutex_lock(&thermal_dbg->lock);
+ trips_crossed = tz_dbg->trips_crossed;
+
+ list_for_each_entry_safe(tze, tmp, &tz_dbg->tz_episodes, node) {
+ list_del(&tze->node);
+ kfree(tze);
+ }
+
tz->debugfs = NULL;
mutex_unlock(&thermal_dbg->lock);
thermal_debugfs_remove_id(thermal_dbg);
+ kfree(trips_crossed);
}