Commit 03f8952c authored by Axel Lin's avatar Axel Lin Committed by Matthew Garrett

platform-drivers-x86: intel_mid_thermal: fix memory leak

The memory for td_info which is allocated in initialize_sensor()
should be properly kfreed in mid_thermal_probe() error patch and
mid_thermal_remove().
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 94ee48b9
...@@ -493,20 +493,30 @@ static int mid_thermal_probe(struct platform_device *pdev) ...@@ -493,20 +493,30 @@ static int mid_thermal_probe(struct platform_device *pdev)
/* Register each sensor with the generic thermal framework*/ /* Register each sensor with the generic thermal framework*/
for (i = 0; i < MSIC_THERMAL_SENSORS; i++) { for (i = 0; i < MSIC_THERMAL_SENSORS; i++) {
struct thermal_device_info *td_info = initialize_sensor(i);
if (!td_info) {
ret = -ENOMEM;
goto err;
}
pinfo->tzd[i] = thermal_zone_device_register(name[i], pinfo->tzd[i] = thermal_zone_device_register(name[i],
0, initialize_sensor(i), &tzd_ops, 0, 0, 0, 0); 0, td_info, &tzd_ops, 0, 0, 0, 0);
if (IS_ERR(pinfo->tzd[i])) if (IS_ERR(pinfo->tzd[i])) {
goto reg_fail; kfree(td_info);
ret = PTR_ERR(pinfo->tzd[i]);
goto err;
}
} }
pinfo->pdev = pdev; pinfo->pdev = pdev;
platform_set_drvdata(pdev, pinfo); platform_set_drvdata(pdev, pinfo);
return 0; return 0;
reg_fail: err:
ret = PTR_ERR(pinfo->tzd[i]); while (--i >= 0) {
while (--i >= 0) kfree(pinfo->tzd[i]->devdata);
thermal_zone_device_unregister(pinfo->tzd[i]); thermal_zone_device_unregister(pinfo->tzd[i]);
}
configure_adc(0); configure_adc(0);
kfree(pinfo); kfree(pinfo);
return ret; return ret;
...@@ -524,8 +534,10 @@ static int mid_thermal_remove(struct platform_device *pdev) ...@@ -524,8 +534,10 @@ static int mid_thermal_remove(struct platform_device *pdev)
int i; int i;
struct platform_info *pinfo = platform_get_drvdata(pdev); struct platform_info *pinfo = platform_get_drvdata(pdev);
for (i = 0; i < MSIC_THERMAL_SENSORS; i++) for (i = 0; i < MSIC_THERMAL_SENSORS; i++) {
kfree(pinfo->tzd[i]->devdata);
thermal_zone_device_unregister(pinfo->tzd[i]); thermal_zone_device_unregister(pinfo->tzd[i]);
}
kfree(pinfo); kfree(pinfo);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment