AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

thermal_hwmon: Sanitize thermal_zone type

Browse Source 
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: 409ef0baca ("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>
This commit is contained in:
Stefan Mavrodiev 2019-07-26 16:32:36 +03:00 committed by Zhang Rui
parent d1abaeb3be
commit 8c7aa18428
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/thermal/thermal_hwmon.c
View File

@ -87,13 +87,17 @@ static struct thermal_hwmon_device *
thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz) thermal_hwmon_lookup_by_type(const struct thermal_zone_device *tz)
{ {
struct thermal_hwmon_device *hwmon; struct thermal_hwmon_device *hwmon;
char type[THERMAL_NAME_LENGTH];
mutex_lock(&thermal_hwmon_list_lock); mutex_lock(&thermal_hwmon_list_lock);
list_for_each_entry(hwmon, &thermal_hwmon_list, node) list_for_each_entry(hwmon, &thermal_hwmon_list, node) {
if (!strcmp(hwmon->type, tz->type)) { strcpy(type, tz->type);
strreplace(type, '-', '_');
if (!strcmp(hwmon->type, type)) {
mutex_unlock(&thermal_hwmon_list_lock); mutex_unlock(&thermal_hwmon_list_lock);
return hwmon; return hwmon;
} }
}
mutex_unlock(&thermal_hwmon_list_lock); mutex_unlock(&thermal_hwmon_list_lock);
return NULL; return NULL;