[RFT PATCH v2 2/2] compal-laptop: Check return value of power_supply_register

From: Krzysztof Kozlowski
Date: Fri Feb 20 2015 - 08:05:26 EST

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: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
Fixes: 9be0fcb5ed46 ("compal-laptop: add JHL90, battery & hwmon interface")
Cc: <stable@xxxxxxxxxxxxxxx>

Changes since v1:
1. Don't unregister hwmon device because previous patch solves this by
using devm-like function.
drivers/platform/x86/compal-laptop.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index eb9885e7fb0e..8455d50a5639 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -1036,7 +1036,9 @@ static int compal_probe(struct platform_device *pdev)

/* Power supply */
- power_supply_register(&compal_device->dev, &data->psy);
+ err = power_supply_register(&compal_device->dev, &data->psy);
+ if (err < 0)
+ goto remove;

platform_set_drvdata(pdev, data);

@@ -1072,6 +1074,7 @@ static int compal_remove(struct platform_device *pdev)

data = platform_get_drvdata(pdev);
+ /* FIXME: missing hwmon_device_unregister() */

sysfs_remove_group(&pdev->dev.kobj, &compal_platform_attr_group);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/