diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-01-15 13:15:24 +0000 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-01-15 15:15:30 +0100 |
| commit | 39196cfe10dd2b46ee28b44abbc0db4f4cb7822f (patch) | |
| tree | bbda4134d3e9b96ae1a15263d80d29c7f59ef618 /drivers/power | |
| parent | 51567ad125f9215b51a84f4707c21fd13301f9c0 (diff) | |
| download | linux-39196cfe10dd2b46ee28b44abbc0db4f4cb7822f.tar.gz | |
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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/cpcap-charger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c index 823d666f09e0..641dcad1133f 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; } |