Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'thermal-5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"Fix NULL pointer dereference in the thermal netlink interface (Nicolas
Cavallari)"
* tag 'thermal-5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: core: Fix TZ_GET_TRIP NULL pointer dereference
+3
-2
+3
-2
drivers/thermal/thermal_netlink.c
+3
-2
drivers/thermal/thermal_netlink.c
···
419
419
for (i = 0; i < tz->trips; i++) {
420
420
421
421
enum thermal_trip_type type;
422
-
int temp, hyst;
422
+
int temp, hyst = 0;
423
423
424
424
tz->ops->get_trip_type(tz, i, &type);
425
425
tz->ops->get_trip_temp(tz, i, &temp);
426
-
tz->ops->get_trip_hyst(tz, i, &hyst);
426
+
if (tz->ops->get_trip_hyst)
427
+
tz->ops->get_trip_hyst(tz, i, &hyst);
427
428
428
429
if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, i) ||
429
430
nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TRIP_TYPE, type) ||