[PATCH] power: supply: z2_battery: Fix possible memleak in z2_batt_probe()

[PATCH] power: supply: z2_battery: Fix possible memleak in z2_batt_probe()

[Zhang Qilong]

If devm_gpiod_get_optional() returns error, the charger should be
freed before z2_batt_probe returns according to the context. We
fix it by just gotoing to 'err' branch.

Fixes: a3b4388ea19b ("power: supply: z2_battery: Convert to GPIO descriptors")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
 drivers/power/supply/z2_battery.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/power/supply/z2_battery.c b/drivers/power/supply/z2_battery.c
index 1897c2984860..d033c1d3ee42 100644
--- a/drivers/power/supply/z2_battery.c
+++ b/drivers/power/supply/z2_battery.c
@@ -206,10 +206,12 @@ static int z2_batt_probe(struct i2c_client *client,
 
 	charger->charge_gpiod = devm_gpiod_get_optional(&client->dev,
 							NULL, GPIOD_IN);
-	if (IS_ERR(charger->charge_gpiod))
-		return dev_err_probe(&client->dev,
+	if (IS_ERR(charger->charge_gpiod)) {
+		ret = dev_err_probe(&client->dev,
 				     PTR_ERR(charger->charge_gpiod),
 				     "failed to get charge GPIO\n");
+		goto err;
+	}
 
 	if (charger->charge_gpiod) {
 		gpiod_set_consumer_name(charger->charge_gpiod, "BATT CHRG");
-- 
2.25.1

Re: [PATCH] power: supply: z2_battery: Fix possible memleak in z2_batt_probe()

[Linus Walleij]

On Mon, Nov 21, 2022 at 2:14 AM Zhang Qilong <zhangqilong3@huawei.com> wrote:

> If devm_gpiod_get_optional() returns error, the charger should be
> freed before z2_batt_probe returns according to the context. We
> fix it by just gotoing to 'err' branch.
>
> Fixes: a3b4388ea19b ("power: supply: z2_battery: Convert to GPIO descriptors")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>

Oops good catch!
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] power: supply: z2_battery: Fix possible memleak in z2_batt_probe()

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 605 bytes --]

Hi,

On Tue, Nov 22, 2022 at 09:33:34PM +0100, Linus Walleij wrote:
> On Mon, Nov 21, 2022 at 2:14 AM Zhang Qilong <zhangqilong3@huawei.com> wrote:
> 
> > If devm_gpiod_get_optional() returns error, the charger should be
> > freed before z2_batt_probe returns according to the context. We
> > fix it by just gotoing to 'err' branch.
> >
> > Fixes: a3b4388ea19b ("power: supply: z2_battery: Convert to GPIO descriptors")
> > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> 
> Oops good catch!
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Thanks, queued.

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]