[PATCH] power: supply: cpcap-charger: Fix null check for power_supply_get_by_name

Charles Han posted 1 patch 7 months ago
drivers/power/supply/cpcap-charger.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
[PATCH] power: supply: cpcap-charger: Fix null check for power_supply_get_by_name
Posted by Charles Han 7 months ago
In the cpcap_usb_detect() function, the power_supply_get_by_name()
function may return `NULL` instead of an error pointer.
To prevent potential null pointer dereferences, Added a null check.

Fixes: eab4e6d953c1 ("power: supply: cpcap-charger: get the battery inserted infomation from cpcap-battery")
Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
 drivers/power/supply/cpcap-charger.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 13300dc60baf..d0c3008db534 100644
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -689,9 +689,8 @@ static void cpcap_usb_detect(struct work_struct *work)
 		struct power_supply *battery;
 
 		battery = power_supply_get_by_name("battery");
-		if (IS_ERR_OR_NULL(battery)) {
-			dev_err(ddata->dev, "battery power_supply not available %li\n",
-					PTR_ERR(battery));
+		if (!battery) {
+			dev_err(ddata->dev, "battery power_supply not available\n");
 			return;
 		}
 
-- 
2.43.0
Re: [PATCH] power: supply: cpcap-charger: Fix null check for power_supply_get_by_name
Posted by Sebastian Reichel 5 months, 4 weeks ago
On Mon, 19 May 2025 10:47:41 +0800, Charles Han wrote:
> In the cpcap_usb_detect() function, the power_supply_get_by_name()
> function may return `NULL` instead of an error pointer.
> To prevent potential null pointer dereferences, Added a null check.
> 
> 

Applied, thanks!

[1/1] power: supply: cpcap-charger: Fix null check for power_supply_get_by_name
      commit: d9fa3aae08f99493e67fb79413c0e95d30fca5e9

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