Received-SPF: pass (google.com: domain of linux-kernel+bounces-159294-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <fb4e29fa-36e4-45ff-979b-2497ec3d946b@arm.com>
Date: Thu, 25 Apr 2024 23:02:37 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v1 1/3] thermal/debugfs: Free all thermal zone debug
 memory on zone removal
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux PM <linux-pm@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>,
 "Rafael J. Wysocki" <rafael@kernel.org>,
 Daniel Lezcano <daniel.lezcano@linaro.org>
References: <12427744.O9o76ZdvQC@kreacher> <4918398.31r3eYUQgx@kreacher>
Content-Language: en-US
From: Lukasz Luba <lukasz.luba@arm.com>
In-Reply-To: <4918398.31r3eYUQgx@kreacher>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 4/25/24 14:49, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> 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>
> ---
>   drivers/thermal/thermal_debugfs.c |   13 +++++++++++++
>   1 file changed, 13 insertions(+)
> 
> Index: linux-pm/drivers/thermal/thermal_debugfs.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_debugfs.c
> +++ linux-pm/drivers/thermal/thermal_debugfs.c
> @@ -832,15 +832,28 @@ void thermal_debug_tz_add(struct thermal
>   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);
>   }
> 
> 
> 
> 

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>