diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2013-07-16 00:38:52 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-07-16 02:27:25 +0200 |
| commit | 94e791f522595e2d5276e6d27a5b3b57f4e1cd8d (patch) | |
| tree | d373b5c406fd2bbdbed68182caf91b13f00cc851 /drivers/thermal | |
| parent | Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_device_add() (diff) | |
| download | linux-94e791f522595e2d5276e6d27a5b3b57f4e1cd8d.tar.xz linux-94e791f522595e2d5276e6d27a5b3b57f4e1cd8d.zip | |
Thermal: x86_pkg_temp: Limit number of pkg temp zones
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>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index cf172d50b5d3..810143a6aa33 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -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); |