[PATCH next] power: supply: fix a double free on error in probe()

Dan Carpenter posted 1 patch 1 year, 5 months ago
drivers/power/supply/max1720x_battery.c | 1 -
1 file changed, 1 deletion(-)
[PATCH next] power: supply: fix a double free on error in probe()
Posted by Dan Carpenter 1 year, 5 months ago
In this code, if devm_add_action_or_reset() fails, it will call
max1720x_unregister_ancillary() which in turn calls
i2c_unregister_device().  Thus the call to i2c_unregister_device() on the
following line is not required and is a double unregister.  Delete it.

Fixes: 47271a935619 ("power: supply: max1720x: add read support for nvmem")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
From code review, not tested.

 drivers/power/supply/max1720x_battery.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/power/supply/max1720x_battery.c b/drivers/power/supply/max1720x_battery.c
index 3e84e70340e4..2bc3dce963a3 100644
--- a/drivers/power/supply/max1720x_battery.c
+++ b/drivers/power/supply/max1720x_battery.c
@@ -427,7 +427,6 @@ static int max1720x_probe_nvmem(struct i2c_client *client,
 
 	ret = devm_add_action_or_reset(dev, max1720x_unregister_ancillary, info);
 	if (ret) {
-		i2c_unregister_device(info->ancillary);
 		dev_err(dev, "Failed to add unregister callback\n");
 		return ret;
 	}
-- 
2.45.2
Re: [PATCH next] power: supply: fix a double free on error in probe()
Posted by Sebastian Reichel 1 year, 5 months ago
On Thu, 05 Sep 2024 16:28:59 +0300, Dan Carpenter wrote:
> In this code, if devm_add_action_or_reset() fails, it will call
> max1720x_unregister_ancillary() which in turn calls
> i2c_unregister_device().  Thus the call to i2c_unregister_device() on the
> following line is not required and is a double unregister.  Delete it.
> 
> 

Applied, thanks!

[1/1] power: supply: fix a double free on error in probe()
      commit: 48f703d6a3d7cf345fe9c6209ea3703fe9024628

Best regards,
-- 
Sebastian Reichel <sebastian.reichel@collabora.com>