From: Uday Khare <udaykhare77@gmail.com>
To: sre@kernel.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Uday Khare <udaykhare77@gmail.com>
Subject: [PATCH 3/4] power: supply: rk817: Fix battery info memory leak on error paths
Date: Thu, 18 Jun 2026 18:51:51 +0530 [thread overview]
Message-ID: <20260618132151.11227-1-udaykhare77@gmail.com> (raw)
In rk817_charger_probe(), power_supply_get_battery_info() is called to
retrieve battery info. However, if the sanity check for required battery
properties fails, or if rk817_battery_init() returns an error, the
function returns immediately without calling
power_supply_put_battery_info() to release the allocated battery info
structure, causing a memory leak.
Fix this by introducing an error label 'err_put_bat_info' that calls
power_supply_put_battery_info() before returning the error code, and
jumping to it from both error paths.
Fixes: 11cb8da0189b ("power: supply: Add charger driver for Rockchip RK817")
Signed-off-by: Uday Khare <udaykhare77@gmail.com>
---
drivers/power/supply/rk817_charger.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/power/supply/rk817_charger.c b/drivers/power/supply/rk817_charger.c
index 9436c6bbf51f..a2ca2b46b2f2 100644
--- a/drivers/power/supply/rk817_charger.c
+++ b/drivers/power/supply/rk817_charger.c
@@ -1156,8 +1156,10 @@ static int rk817_charger_probe(struct platform_device *pdev)
(bat_info->constant_charge_voltage_max_uv <= 0) ||
(bat_info->constant_charge_current_max_ua <= 0) ||
(bat_info->charge_term_current_ua <= 0)) {
- return dev_err_probe(dev, -EINVAL,
- "Required bat info missing or invalid\n");
+ dev_err_probe(dev, -EINVAL,
+ "Required bat info missing or invalid\n");
+ ret = -EINVAL;
+ goto err_put_bat_info;
}
charger->bat_charge_full_design_uah = bat_info->charge_full_design_uah;
@@ -1170,7 +1172,7 @@ static int rk817_charger_probe(struct platform_device *pdev)
*/
ret = rk817_battery_init(charger, bat_info);
if (ret)
- return ret;
+ goto err_put_bat_info;
power_supply_put_battery_info(charger->bat_ps, bat_info);
@@ -1209,6 +1211,10 @@ static int rk817_charger_probe(struct platform_device *pdev)
mod_delayed_work(system_percpu_wq, &charger->work, 0);
return 0;
+
+err_put_bat_info:
+ power_supply_put_battery_info(charger->bat_ps, bat_info);
+ return ret;
}
static int __maybe_unused rk817_suspend(struct device *dev)
--
2.54.0
reply other threads:[~2026-06-18 13:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260618132151.11227-1-udaykhare77@gmail.com \
--to=udaykhare77@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox