Commit 98a1fb97 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Ben Hutchings

compal-laptop: Check return value of power_supply_register

commit 1915a718 upstream.

The return value of power_supply_register() call was not checked and
even on error probe() function returned 0. If registering failed then
during unbind the driver tried to unregister power supply which was not
actually registered.

This could lead to memory corruption because power_supply_unregister()
unconditionally cleans up given power supply.

Fix this by checking return status of power_supply_register() call. In
case of failure, clean up sysfs entries and fail the probe.
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 9be0fcb5 ("compal-laptop: add JHL90, battery & hwmon interface")
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
[bwh: Backported to 3.2: insert the appropriate cleanup code as there is no
 common 'remove' label]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 48a3b303
......@@ -1046,7 +1046,14 @@ static int __devinit compal_probe(struct platform_device *pdev)
/* Power supply */
initialize_power_supply_data(data);
power_supply_register(&compal_device->dev, &data->psy);
err = power_supply_register(&compal_device->dev, &data->psy);
if (err < 0) {
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj,
&compal_attribute_group);
kfree(data);
return err;
}
platform_set_drvdata(pdev, data);
......
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