[PATCH] power_supply: 88pm860x_charger: do not pass NULL to power_supply_put

From: Colin King
Date: Sun Feb 28 2016 - 14:58:12 EST


From: Colin Ian King <colin.king@xxxxxxxxxxxxx>

In the case where power_supply_get_by_name returns NULL the current
error return path calls power_supply_put with a NULL psy which will
cause a null pointer dereference. Avoid this with an immediate
return.

Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
---
drivers/power/88pm860x_charger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 297e72d..2b82e44 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -435,7 +435,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data)

psy = power_supply_get_by_name(pm860x_supplied_to[0]);
if (!psy)
- goto out;
+ return IRQ_HANDLED;
ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &temp);
if (ret)
goto out;
--
2.7.0