From: Colin Ian King <colin.king@canonical.com>
Date: Fri, 15 Jan 2021 13:15:24 +0000 (+0000)
Subject: power: supply: cpcap-charger: Fix power_supply_put on null battery pointer
X-Git-Tag: v5.12-rc1~109^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39196cfe10dd2b46ee28b44abbc0db4f4cb7822f;p=thirdparty%2Fkernel%2Flinux.git

power: supply: cpcap-charger: Fix power_supply_put on null battery pointer

Currently if the pointer battery is null there is a null pointer
dereference on the call to power_supply_put.  Fix this by only
performing the put if battery is not null.

Addresses-Coverity: ("Dereference after null check")
Fixes: 4bff91bb3231 ("power: supply: cpcap-charger: Fix missing power_supply_put()")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---

diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 823d666f09e0e..641dcad1133f7 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -300,8 +300,9 @@ cpcap_charger_get_bat_const_charge_voltage(struct cpcap_charger_ddata *ddata)
 				&prop);
 		if (!error)
 			voltage = prop.intval;
+
+		power_supply_put(battery);
 	}
-	power_supply_put(battery);
 
 	return voltage;
 }