From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Lukasz Luba <lukasz.luba@arm.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH v2 3/3] thermal/debugfs: Prevent use-after-free from occurring after cdev removal
Date: Fri, 26 Apr 2024 11:28:52 +0200 [thread overview]
Message-ID: <2740417.mvXUDI8C0e@kreacher> (raw)
In-Reply-To: <13503555.uLZWGnKmhe@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since thermal_debug_cdev_remove() does not run under cdev->lock, it can
run in parallel with thermal_debug_cdev_state_update() and it may free
the struct thermal_debugfs object used by the latter after it has been
checked against NULL.
If that happens, thermal_debug_cdev_state_update() will access memory
that has been freed already causing the kernel to crash.
Address this by using cdev->lock in thermal_debug_cdev_remove() around
the cdev->debugfs value check (in case the same cdev is removed at the
same time in two different threads) and its reset to NULL.
Fixes: 755113d76786 ("thermal/debugfs: Add thermal cooling device debugfs information")
Cc :6.8+ <stable@vger.kernel.org> # 6.8+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v1 -> v2: Add missing mutex_unlock() (Lukasz).
---
drivers/thermal/thermal_debugfs.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
Index: linux-pm/drivers/thermal/thermal_debugfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_debugfs.c
+++ linux-pm/drivers/thermal/thermal_debugfs.c
@@ -505,15 +505,23 @@ void thermal_debug_cdev_add(struct therm
*/
void thermal_debug_cdev_remove(struct thermal_cooling_device *cdev)
{
- struct thermal_debugfs *thermal_dbg = cdev->debugfs;
+ struct thermal_debugfs *thermal_dbg;
- if (!thermal_dbg)
+ mutex_lock(&cdev->lock);
+
+ thermal_dbg = cdev->debugfs;
+ if (!thermal_dbg) {
+ mutex_unlock(&cdev->lock);
return;
+ }
+
+ cdev->debugfs = NULL;
+
+ mutex_unlock(&cdev->lock);
mutex_lock(&thermal_dbg->lock);
thermal_debugfs_cdev_clear(&thermal_dbg->cdev_dbg);
- cdev->debugfs = NULL;
mutex_unlock(&thermal_dbg->lock);
next prev parent reply other threads:[~2024-04-26 9:28 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
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 ` Rafael J. Wysocki [this message]
2024-04-26 9:35 ` [PATCH v2 " 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=2740417.mvXUDI8C0e@kreacher \
--to=rjw@rjwysocki.net \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=rafael@kernel.org \
/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.