Skip to content

Commit

Permalink
power_supply: twl4030_madc: Check return value of power_supply_register
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: da0a00e ("power: Add twl4030_madc battery driver.")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
  • Loading branch information
krzk authored and sre committed Feb 25, 2015
1 parent cc64056 commit 68c3ed6
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/power/twl4030_madc_battery.c
Expand Up @@ -192,6 +192,7 @@ static int twl4030_madc_battery_probe(struct platform_device *pdev)
{
struct twl4030_madc_battery *twl4030_madc_bat;
struct twl4030_madc_bat_platform_data *pdata = pdev->dev.platform_data;
int ret = 0;

twl4030_madc_bat = kzalloc(sizeof(*twl4030_madc_bat), GFP_KERNEL);
if (!twl4030_madc_bat)
Expand All @@ -216,9 +217,11 @@ static int twl4030_madc_battery_probe(struct platform_device *pdev)

twl4030_madc_bat->pdata = pdata;
platform_set_drvdata(pdev, twl4030_madc_bat);
power_supply_register(&pdev->dev, &twl4030_madc_bat->psy);
ret = power_supply_register(&pdev->dev, &twl4030_madc_bat->psy);
if (ret < 0)
kfree(twl4030_madc_bat);

return 0;
return ret;
}

static int twl4030_madc_battery_remove(struct platform_device *pdev)
Expand Down

0 comments on commit 68c3ed6

Please sign in to comment.