| From e12fa32b764a90653b621bda6992dbc3fda2bb1e Mon Sep 17 00:00:00 2001 |
| From: Stefan Mavrodiev <stefan@olimex.com> |
| Date: Fri, 26 Jul 2019 16:32:36 +0300 |
| Subject: [PATCH] thermal_hwmon: Sanitize thermal_zone type |
| |
| commit 8c7aa184281c01fc26f319059efb94725012921d upstream. |
| |
| When calling thermal_add_hwmon_sysfs(), the device type is sanitized by |
| replacing '-' with '_'. However tz->type remains unsanitized. Thus |
| calling thermal_hwmon_lookup_by_type() returns no device. And if there is |
| no device, thermal_remove_hwmon_sysfs() fails with "hwmon device lookup |
| failed!". |
| |
| The result is unregisted hwmon devices in the sysfs. |
| |
| Fixes: 409ef0bacacf ("thermal_hwmon: Sanitize attribute name passed to hwmon") |
| |
| Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> |
| Signed-off-by: Zhang Rui <rui.zhang@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c |
| index 40c69a533b24..dd5d8ee37928 100644 |
| --- a/drivers/thermal/thermal_hwmon.c |
| +++ b/drivers/thermal/thermal_hwmon.c |
| @@ -87,13 +87,17 @@ static struct thermal_hwmon_device * |
| thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz) |
| { |
| struct thermal_hwmon_device *hwmon; |
| + char type[THERMAL_NAME_LENGTH]; |
| |
| mutex_lock(&thermal_hwmon_list_lock); |
| - list_for_each_entry(hwmon, &thermal_hwmon_list, node) |
| - if (!strcmp(hwmon->type, tz->type)) { |
| + list_for_each_entry(hwmon, &thermal_hwmon_list, node) { |
| + strcpy(type, tz->type); |
| + strreplace(type, '-', '_'); |
| + if (!strcmp(hwmon->type, type)) { |
| mutex_unlock(&thermal_hwmon_list_lock); |
| return hwmon; |
| } |
| + } |
| mutex_unlock(&thermal_hwmon_list_lock); |
| |
| return NULL; |
| -- |
| 2.7.4 |
| |
