p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thermal/int340x/processor_thermal: Fix memory leak 

Address memory leak for buffer allocated with ACPI_ALLOCATE_BUFFER.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Srinivas Pandruvada 2014-12-23 15:23:35 -08:00 committed by Zhang Rui
parent f01bc8f37e
commit cc3f71a415
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/thermal/int340x_thermal/processor_thermal_device.c
View File

@ -127,6 +127,7 @@ static int proc_thermal_add(struct device *dev,
union acpi_object *elements, *ppcc; union acpi_object *elements, *ppcc;
union acpi_object *p; union acpi_object *p;
int i; int i;
int ret;
adev = ACPI_COMPANION(dev); adev = ACPI_COMPANION(dev);
@ -137,16 +138,20 @@ static int proc_thermal_add(struct device *dev,
p = buf.pointer; p = buf.pointer;
if (!p || (p->type != ACPI_TYPE_PACKAGE)) { if (!p || (p->type != ACPI_TYPE_PACKAGE)) {
dev_err(dev, "Invalid PPCC data\n"); dev_err(dev, "Invalid PPCC data\n");
return -EFAULT; ret = -EFAULT;
goto free_buffer;
} }
if (!p->package.count) { if (!p->package.count) {
dev_err(dev, "Invalid PPCC package size\n"); dev_err(dev, "Invalid PPCC package size\n");
return -EFAULT; ret = -EFAULT;
goto free_buffer;
} }
proc_priv = devm_kzalloc(dev, sizeof(*proc_priv), GFP_KERNEL); proc_priv = devm_kzalloc(dev, sizeof(*proc_priv), GFP_KERNEL);
if (!proc_priv) if (!proc_priv) {
return -ENOMEM; ret = -ENOMEM;
goto free_buffer;
}
proc_priv->dev = dev; proc_priv->dev = dev;
proc_priv->adev = adev; proc_priv->adev = adev;
@ -154,9 +159,10 @@ static int proc_thermal_add(struct device *dev,
for (i = 0; i < min((int)p->package.count - 1, 2); ++i) { for (i = 0; i < min((int)p->package.count - 1, 2); ++i) {
elements = &(p->package.elements[i+1]); elements = &(p->package.elements[i+1]);
if (elements->type != ACPI_TYPE_PACKAGE || if (elements->type != ACPI_TYPE_PACKAGE ||
elements->package.count != 6) elements->package.count != 6) {
return -EFAULT; ret = -EFAULT;
goto free_buffer;
}
ppcc = elements->package.elements; ppcc = elements->package.elements;
proc_priv->power_limits[i].index = ppcc[0].integer.value; proc_priv->power_limits[i].index = ppcc[0].integer.value;
proc_priv->power_limits[i].min_uw = ppcc[1].integer.value; proc_priv->power_limits[i].min_uw = ppcc[1].integer.value;
@ -168,8 +174,13 @@ static int proc_thermal_add(struct device *dev,
*priv = proc_priv; *priv = proc_priv;
return sysfs_create_group(&dev->kobj, ret = sysfs_create_group(&dev->kobj,
&power_limit_attribute_group); &power_limit_attribute_group);
free_buffer:
kfree(buf.pointer);
return ret;
} }
void proc_thermal_remove(struct proc_thermal_device *proc_priv) void proc_thermal_remove(struct proc_thermal_device *proc_priv)