Skip to contentSkip to conversation

Patch "power_supply: lp8788-charger: Fix leaked power supply on probe fail" has been added to the 3.19-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2015 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

power_supply: lp8788-charger: Fix leaked power supply on probe fail

to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
power_supply-lp8788-charger-fix-leaked-power-supply-on-probe-fail.patch
and it can be found in the queue-3.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From a7117f81e8391e035c49b3440792f7e6cea28173 Mon Sep 17 00:00:00 2001

From: Krzysztof Kozlowski <[email protected]>
Date: Fri, 20 Feb 2015 14:32:25 +0100
Subject: power_supply: lp8788-charger: Fix leaked power supply on probe fail

From: Krzysztof Kozlowski <[email protected]>

commit a7117f81e8391e035c49b3440792f7e6cea28173 upstream.

Driver forgot to unregister charger power supply if registering of battery supply failed in probe(). In such case the memory associated with power supply leaked.

Fixes 98a276649358 ("power_supply: Add new lp8788 charger driver")
---
 drivers/power/lp8788-charger.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/lp8788-charger.c +3 -1
@@ -417,8 +417,10 @@ static int lp8788_psy_register(struct pl
 	pchg->battery.num_properties = ARRAY_SIZE(lp8788_battery_prop);
 	pchg->battery.get_property = lp8788_battery_get_property;
 
-	if (power_supply_register(&pdev->dev, &pchg->battery))
+	if (power_supply_register(&pdev->dev, &pchg->battery)) {
+		power_supply_unregister(&pchg->charger);
 		return -EPERM;
+	}
 
 	return 0;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-3.19/compal-laptop-fix-leaking-hwmon-device.patch queue-3.19/compal-laptop-check-return-value-of-power_supply_register.patch queue-3.19/power_supply-twl4030_madc-check-return-value-of-power_supply_register.patch queue-3.19/power_supply-ipaq_micro_battery-fix-leaking-workqueue.patch queue-3.19/power_supply-lp8788-charger-fix-leaked-power-supply-on-probe-fail.patch queue-3.19/power_supply-ipaq_micro_battery-check-return-values-in-probe.patch