Skip to content

Commit d351eb0

Browse files
committed
thermal/debugfs: Prevent use-after-free from occurring after cdev removal
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: 755113d ("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> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
1 parent c7f7c37 commit d351eb0

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

drivers/thermal/thermal_debugfs.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,23 @@ void thermal_debug_cdev_add(struct thermal_cooling_device *cdev)
505505
*/
506506
void thermal_debug_cdev_remove(struct thermal_cooling_device *cdev)
507507
{
508-
struct thermal_debugfs *thermal_dbg = cdev->debugfs;
508+
struct thermal_debugfs *thermal_dbg;
509509

510-
if (!thermal_dbg)
510+
mutex_lock(&cdev->lock);
511+
512+
thermal_dbg = cdev->debugfs;
513+
if (!thermal_dbg) {
514+
mutex_unlock(&cdev->lock);
511515
return;
516+
}
517+
518+
cdev->debugfs = NULL;
519+
520+
mutex_unlock(&cdev->lock);
512521

513522
mutex_lock(&thermal_dbg->lock);
514523

515524
thermal_debugfs_cdev_clear(&thermal_dbg->cdev_dbg);
516-
cdev->debugfs = NULL;
517525

518526
mutex_unlock(&thermal_dbg->lock);
519527

0 commit comments

Comments
 (0)