diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-18 09:09:12 -0400 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-07-15 04:26:33 -0400 |
commit | c7c1b3112e643d290471abd0f3b27ffeec6f28dd (patch) | |
tree | 6bd8b56facdff4d7137cd3c64d2011331cfad448 /drivers/thermal | |
parent | f3ed0a17f0292300b3caca32d823ecd32554a667 (diff) |
Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_device_add()
If krealloc() returns NULL, it doesn't free the original. So any code
of the form 'foo = krealloc(foo, ...);' is almost certainly a bug.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index 034604c021d6..cf172d50b5d3 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c | |||
@@ -394,6 +394,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
394 | char buffer[30]; | 394 | char buffer[30]; |
395 | int thres_count; | 395 | int thres_count; |
396 | u32 eax, ebx, ecx, edx; | 396 | u32 eax, ebx, ecx, edx; |
397 | u8 *temp; | ||
397 | 398 | ||
398 | cpuid(6, &eax, &ebx, &ecx, &edx); | 399 | cpuid(6, &eax, &ebx, &ecx, &edx); |
399 | thres_count = ebx & 0x07; | 400 | thres_count = ebx & 0x07; |
@@ -417,13 +418,14 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
417 | spin_lock(&pkg_work_lock); | 418 | spin_lock(&pkg_work_lock); |
418 | if (topology_physical_package_id(cpu) > max_phy_id) | 419 | if (topology_physical_package_id(cpu) > max_phy_id) |
419 | max_phy_id = topology_physical_package_id(cpu); | 420 | max_phy_id = topology_physical_package_id(cpu); |
420 | pkg_work_scheduled = krealloc(pkg_work_scheduled, | 421 | temp = krealloc(pkg_work_scheduled, |
421 | (max_phy_id+1) * sizeof(u8), GFP_ATOMIC); | 422 | (max_phy_id+1) * sizeof(u8), GFP_ATOMIC); |
422 | if (!pkg_work_scheduled) { | 423 | if (!temp) { |
423 | spin_unlock(&pkg_work_lock); | 424 | spin_unlock(&pkg_work_lock); |
424 | err = -ENOMEM; | 425 | err = -ENOMEM; |
425 | goto err_ret_free; | 426 | goto err_ret_free; |
426 | } | 427 | } |
428 | pkg_work_scheduled = temp; | ||
427 | pkg_work_scheduled[topology_physical_package_id(cpu)] = 0; | 429 | pkg_work_scheduled[topology_physical_package_id(cpu)] = 0; |
428 | spin_unlock(&pkg_work_lock); | 430 | spin_unlock(&pkg_work_lock); |
429 | 431 | ||