lkml.org 
[lkml]   [2023]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 -next] thermal/drivers/thermal_hwmon: Fix a kernel NULL pointer dereference
Date
When the hwmon device node of a thermal zone device is not found,
using hwmon->device causes a kernel NULL pointer dereference.

Skip removing hwmon device for thermal zones without hwmon device, and
fix the kernel NULL pointer dereference when hwmon device is not found.

Fixes: dec07d399cc8 ("thermal: Don't use 'device' internal thermal zone structure field")
Reported-by: Preble Adam C <adam.c.preble@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
v1 -> v2
Add check for devices without hwmon device.
Use pr_debug instead of dev_dbg.
---
drivers/thermal/thermal_hwmon.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index c59db17dddd6..1cdee2ee8d4d 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -226,10 +226,12 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
struct thermal_hwmon_device *hwmon;
struct thermal_hwmon_temp *temp;

+ if (tz->tzp && tz->tzp->no_hwmon)
+ return;
+
hwmon = thermal_hwmon_lookup_by_type(tz);
if (unlikely(!hwmon)) {
- /* Should never happen... */
- dev_dbg(hwmon->device, "hwmon device lookup failed!\n");
+ pr_debug("hwmon device lookup failed!\n");
return;
}

--
2.25.1
\
 
 \ /
  Last update: 2023-03-29 14:27    [W:0.052 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site