Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c3ed6f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Sebastian Reichel
Browse files

power_supply: twl4030_madc: Check return value of power_supply_register 



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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: da0a00eb ("power: Add twl4030_madc battery driver.")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent cc640566

drivers/power/twl4030_madc_battery.c

+5 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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)