Commit 85b52122 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-intel' 

Merge an x86_pkg_temp_thermal Intel thermal driver fix (Zhang Rui).

* thermal-intel:
  thermal: intel: x86_pkg_temp_thermal: Add lower bound check for sysfs input
parents ce07727a 2a96243e

drivers/thermal/intel/x86_pkg_temp_thermal.c

+5 −3
Original line number Diff line number Diff line
@@ -124,14 +124,16 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp) 
{

	struct zone_device *zonedev = thermal_zone_device_priv(tzd);

	u32 l, h, mask, shift, intr;

	int tj_max, ret;

	int tj_max, val, ret;



	tj_max = intel_tcc_get_tjmax(zonedev->cpu);

	if (tj_max < 0)

		return tj_max;

	tj_max *= 1000;



	if (trip >= MAX_NUMBER_OF_TRIPS || temp >= tj_max)

	val = (tj_max - temp)/1000;



	if (trip >= MAX_NUMBER_OF_TRIPS || val < 0 || val > 0x7f)

		return -EINVAL;



	ret = rdmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT,
@@ -156,7 +158,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp) 
	if (!temp) {

		l &= ~intr;

	} else {

		l |= (tj_max - temp)/1000 << shift;

		l |= val << shift;

		l |= intr;

	}