From patchwork Mon May 19 02:47:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Han X-Patchwork-Id: 891253 Received: from ssh247.corpemail.net (ssh247.corpemail.net [210.51.61.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FCB64C8F; Mon, 19 May 2025 02:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.51.61.247 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622873; cv=none; b=BcR/uqPfhHIa2xLWlxVj/1wlepKRQt9U6lkEdn3yj5mxCHjMGYcMnoSn4oeiV+pqTOeyZ4wnaDI3ZrO0Ms4E7xX2J4DPPw2l5U/3y+xn/z9Cv4zu9hPhAK1Orl8EAqHn5nteFX0KMwZBcDq1W17IQ4Zw7q8YOUilITXV/q9lJqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747622873; c=relaxed/simple; bh=ov5MozL0+auJvcCcrKOTiQNZgIoA/QRYKpVO6oJxWD4=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=khp3OMgCk5stEwmsCeMZzROU651hPxDAO7og+3zIhSANFbb5RxoDgdrzr0tXJdm0lLD50G126GgWdtIoGW/LHBJPTYQTn4m2R1cU+TOTdVNDCuL2MXKPuFIdbuM6kiX5CwOGt37eOh+moFqGuL5vDCKyhDOcgevnx7oEZgumlCE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=inspur.com; spf=pass smtp.mailfrom=inspur.com; arc=none smtp.client-ip=210.51.61.247 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=inspur.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=inspur.com Received: from jtjnmail201603.home.langchao.com by ssh247.corpemail.net ((D)) with ASMTP (SSL) id 202505191047446688; Mon, 19 May 2025 10:47:44 +0800 Received: from jtjnmail201607.home.langchao.com (10.100.2.7) by jtjnmail201603.home.langchao.com (10.100.2.3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 19 May 2025 10:47:43 +0800 Received: from locahost.localdomain.com (10.94.15.43) by jtjnmail201607.home.langchao.com (10.100.2.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 19 May 2025 10:47:43 +0800 From: Charles Han To: , CC: , , Charles Han Subject: [PATCH] power: supply: cpcap-charger: Fix null check for power_supply_get_by_name Date: Mon, 19 May 2025 10:47:41 +0800 Message-ID: <20250519024741.5846-1-hanchunchao@inspur.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: Jtjnmail201613.home.langchao.com (10.100.2.13) To jtjnmail201607.home.langchao.com (10.100.2.7) tUid: 202551910474498259a1827014c7e1b80724de4b499bd X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com 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 --- 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; }