]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Thermal: x86_pkg_temp: Limit number of pkg temp zones
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Mon, 15 Jul 2013 22:38:52 +0000 (15:38 -0700)
committerZhang Rui <rui.zhang@intel.com>
Tue, 16 Jul 2013 00:27:25 +0000 (08:27 +0800)
Although it is unlikley that physical package id is set to some
arbitary number, it is better to prevent in anycase. Since package
temp zones use this in thermal zone type and for allocation, added
a limit.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/x86_pkg_temp_thermal.c

index cf172d50b5d3440100a2c4a00772bc8291e4c895..810143a6aa33ff81941b7f9ed169931e90ec2b49 100644 (file)
@@ -54,6 +54,8 @@ MODULE_PARM_DESC(notify_delay_ms,
 * is some wrong values returned by cpuid for number of thresholds.
 */
 #define MAX_NUMBER_OF_TRIPS    2
+/* Limit number of package temp zones */
+#define MAX_PKG_TEMP_ZONE_IDS  256
 
 struct phy_dev_entry {
        struct list_head list;
@@ -401,6 +403,9 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
        if (!thres_count)
                return -ENODEV;
 
+       if (topology_physical_package_id(cpu) > MAX_PKG_TEMP_ZONE_IDS)
+               return -ENODEV;
+
        thres_count = clamp_val(thres_count, 0, MAX_NUMBER_OF_TRIPS);
 
        err = get_tj_max(cpu, &tj_max);