summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2022-11-10 07:24:57 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-11-14 19:04:37 +0100
commitea37bec51ff442546e4a57d5cca2de9cc64a9df3 (patch)
treeaf7d91ef27f6ddbf639148f7d50d680d78a40cc1 /drivers/thermal
parent1c439dec359caa225c7752334c7a14ef9e3344c7 (diff)
downloadlinux-stable-ea37bec51ff442546e4a57d5cca2de9cc64a9df3.tar.gz
linux-stable-ea37bec51ff442546e4a57d5cca2de9cc64a9df3.tar.bz2
linux-stable-ea37bec51ff442546e4a57d5cca2de9cc64a9df3.zip
thermal/core: Protect hwmon accesses to thermal operations with thermal zone mutex
In preparation to protecting access to thermal operations against thermal zone device removal, protect hwmon accesses to thermal zone operations with the thermal zone mutex. After acquiring the mutex, ensure that the thermal zone device is registered before proceeding. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/thermal_hwmon.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index f53f4ceb6a5d..c594c42bea6d 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -77,7 +77,15 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
int temperature;
int ret;
- ret = tz->ops->get_crit_temp(tz, &temperature);
+ mutex_lock(&tz->lock);
+
+ if (device_is_registered(&tz->device))
+ ret = tz->ops->get_crit_temp(tz, &temperature);
+ else
+ ret = -ENODEV;
+
+ mutex_unlock(&tz->lock);
+
if (ret)
return ret;