Skip to content

Commit

Permalink
Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_d…
Browse files Browse the repository at this point in the history
…evice_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>
  • Loading branch information
Wei Yongjun authored and Zhang Rui committed Jul 15, 2013
1 parent f3ed0a1 commit c7c1b31
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/thermal/x86_pkg_temp_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
char buffer[30];
int thres_count;
u32 eax, ebx, ecx, edx;
u8 *temp;

cpuid(6, &eax, &ebx, &ecx, &edx);
thres_count = ebx & 0x07;
Expand All @@ -417,13 +418,14 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
spin_lock(&pkg_work_lock);
if (topology_physical_package_id(cpu) > max_phy_id)
max_phy_id = topology_physical_package_id(cpu);
pkg_work_scheduled = krealloc(pkg_work_scheduled,
(max_phy_id+1) * sizeof(u8), GFP_ATOMIC);
if (!pkg_work_scheduled) {
temp = krealloc(pkg_work_scheduled,
(max_phy_id+1) * sizeof(u8), GFP_ATOMIC);
if (!temp) {
spin_unlock(&pkg_work_lock);
err = -ENOMEM;
goto err_ret_free;
}
pkg_work_scheduled = temp;
pkg_work_scheduled[topology_physical_package_id(cpu)] = 0;
spin_unlock(&pkg_work_lock);

Expand Down

0 comments on commit c7c1b31

Please sign in to comment.