From: Lukasz Luba <lukasz.luba@arm.com>
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>
Subject: Re: [PATCH v1 1/3] thermal/debugfs: Free all thermal zone debug memory on zone removal
Date: Thu, 25 Apr 2024 23:02:37 +0100 [thread overview]
Message-ID: <fb4e29fa-36e4-45ff-979b-2497ec3d946b@arm.com> (raw)
In-Reply-To: <4918398.31r3eYUQgx@kreacher>
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>
next prev parent reply other threads:[~2024-04-25 22:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 13:46 [PATCH v1 0/3] thermal/debugfs: Fix a memory leak on removal and locking Rafael J. Wysocki
2024-04-25 13:49 ` [PATCH v1 1/3] thermal/debugfs: Free all thermal zone debug memory on zone removal Rafael J. Wysocki
2024-04-25 22:02 ` Lukasz Luba [this message]
2024-04-25 13:55 ` [PATCH v1 2/3] thermal/debugfs: Fix thermal zone locking Rafael J. Wysocki
2024-04-25 15:47 ` [Alternative][PATCH v1 2/3] thermal/debugfs: Fix two locking issues with thermal zone debug Rafael J. Wysocki
2024-04-25 22:20 ` Lukasz Luba
2024-04-25 13:57 ` [PATCH v1 3/3] thermal/debugfs: Prevent use-after-free from occurring after cdev removal Rafael J. Wysocki
2024-04-25 22:05 ` Lukasz Luba
2024-04-26 9:18 ` Rafael J. Wysocki
2024-04-26 9:28 ` [PATCH v2 " Rafael J. Wysocki
2024-04-26 9:35 ` Lukasz Luba
2024-04-26 9:54 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fb4e29fa-36e4-45ff-979b-2497ec3d946b@arm.com \
--to=lukasz.luba@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.