Skip to content

Commit 96cfe05

Browse files
Subbaraman Narayanamurthyrafaeljw
authored andcommitted
thermal: Fix NULL pointer dereferences in of_thermal_ functions
of_parse_thermal_zones() parses the thermal-zones node and registers a thermal_zone device for each subnode. However, if a thermal zone is consuming a thermal sensor and that thermal sensor device hasn't probed yet, an attempt to set trip_point_*_temp for that thermal zone device can cause a NULL pointer dereference. Fix it. console:/sys/class/thermal/thermal_zone87 # echo 120000 > trip_point_0_temp ... Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020 ... Call trace: of_thermal_set_trip_temp+0x40/0xc4 trip_point_temp_store+0xc0/0x1dc dev_attr_store+0x38/0x88 sysfs_kf_write+0x64/0xc0 kernfs_fop_write_iter+0x108/0x1d0 vfs_write+0x2f4/0x368 ksys_write+0x7c/0xec __arm64_sys_write+0x20/0x30 el0_svc_common.llvm.7279915941325364641+0xbc/0x1bc do_el0_svc+0x28/0xa0 el0_svc+0x14/0x24 el0_sync_handler+0x88/0xec el0_sync+0x1c0/0x200 While at it, fix the possible NULL pointer dereference in other functions as well: of_thermal_get_temp(), of_thermal_set_emul_temp(), of_thermal_get_trend(). Suggested-by: David Collins <[email protected]> Signed-off-by: Subbaraman Narayanamurthy <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent f73cd9c commit 96cfe05

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/thermal/thermal_of.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz,
8989
{
9090
struct __thermal_zone *data = tz->devdata;
9191

92-
if (!data->ops->get_temp)
92+
if (!data->ops || !data->ops->get_temp)
9393
return -EINVAL;
9494

9595
return data->ops->get_temp(data->sensor_data, temp);
@@ -186,6 +186,9 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz,
186186
{
187187
struct __thermal_zone *data = tz->devdata;
188188

189+
if (!data->ops || !data->ops->set_emul_temp)
190+
return -EINVAL;
191+
189192
return data->ops->set_emul_temp(data->sensor_data, temp);
190193
}
191194

@@ -194,7 +197,7 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
194197
{
195198
struct __thermal_zone *data = tz->devdata;
196199

197-
if (!data->ops->get_trend)
200+
if (!data->ops || !data->ops->get_trend)
198201
return -EINVAL;
199202

200203
return data->ops->get_trend(data->sensor_data, trip, trend);
@@ -301,7 +304,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,
301304
if (trip >= data->ntrips || trip < 0)
302305
return -EDOM;
303306

304-
if (data->ops->set_trip_temp) {
307+
if (data->ops && data->ops->set_trip_temp) {
305308
int ret;
306309

307310
ret = data->ops->set_trip_temp(data->sensor_data, trip, temp);

0 commit comments

Comments
 (0)