Commit a4ffdb61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8d670948 5838a148

drivers/thermal/thermal_netlink.c

+3 −2
Original line number Diff line number Diff line
@@ -419,10 +419,11 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p) 
	for (i = 0; i < tz->trips; i++) {



		enum thermal_trip_type type;

		int temp, hyst;

		int temp, hyst = 0;



		tz->ops->get_trip_type(tz, i, &type);

		tz->ops->get_trip_temp(tz, i, &temp);

		if (tz->ops->get_trip_hyst)

			tz->ops->get_trip_hyst(tz, i, &hyst);



		if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TRIP_ID, i) ||