From patchwork Sun Dec 4 02:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 29365 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1617794wrr; Sat, 3 Dec 2022 18:47:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf65iM1yCOjvNA1nU2QwEMJ3Ny1hW2pb++rrtfSWONGfMR0TdPb3p8AGh39ssrtHW22nGwqv X-Received: by 2002:a63:4f4c:0:b0:45c:562f:b2b9 with SMTP id p12-20020a634f4c000000b0045c562fb2b9mr51937083pgl.245.1670122053246; Sat, 03 Dec 2022 18:47:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670122053; cv=none; d=google.com; s=arc-20160816; b=DFbRzoq9+RC1zGwQ/nXm+6kpydYplszM0zo2yLtA2AQRBFWYW7sBYoYydaBfkNl9d3 moLhwRuTi6IAxtH32D6bkHcmDbHC1d81h5wuqFd5Z+dmS/qFu1YeeQVqRClnGrNcGnnS kCNKqxlmyE1rUh4I+bw2IFRoACKcv+K4+N33Mx8mcAX6UGMvaFsF3CG/wJZ/B4SsVKU/ nbwGM5io0e3pdvY6R6Q3uosNzapmGcCOrLVhEuaxZZH5qKhbWZXafn9ONZjvhgjPoJ8D x9HRXA0l/FFVpl5LMb2mIm7ChhqZfjY0iF+aCdbjFBTuqn8J/3+q2p2vIenRAsRx88TZ YbrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=t4cr1szga8ysPvPmnj404KclGvNOwHP9raAhRFYIoqg=; b=B0gsOen/qgruNQn9B5ffBvl+ljhUeCcW42p4XnVEhzJIsQYnYdo98KHgCQaiRaomtX myfcSOa0pyI3H+y5f7TqaKED2K06u71Vxo2nbjdCgo5DDZUJNN3d6lt86ACSIhaHy9qc qKlkHYbHmMK5/hNgWMVqs2JghvHnHzuGuKkHLGMVqim+A+vvLmChQ81FzvDhTuEKj2sV cdavMA2t33JDP5a2TCbNOf5m6tPxktceMIojzTfiM2XFOeojxlaPCVeZPqHeD/+ax8XH LxvMRVbf98+iWoZR8D8/t9G6gcvLfhFtQfzlqtGii5BahxgdYUdQoBKZRYsN+mSBsIHB G1xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m127-20020a632685000000b0047842533cc4si11727944pgm.838.2022.12.03.18.47.16; Sat, 03 Dec 2022 18:47:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229833AbiLDCmE (ORCPT + 99 others); Sat, 3 Dec 2022 21:42:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbiLDCmD (ORCPT ); Sat, 3 Dec 2022 21:42:03 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D8D018356; Sat, 3 Dec 2022 18:42:02 -0800 (PST) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NPrXV1wNczRpg0; Sun, 4 Dec 2022 10:41:14 +0800 (CST) Received: from huawei.com (10.67.175.83) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sun, 4 Dec 2022 10:41:59 +0800 From: ruanjinjie To: , , , , CC: Subject: [PATCH] power: supply: fix null pointer dereferencing in power_supply_get_battery_info Date: Sun, 4 Dec 2022 10:38:57 +0800 Message-ID: <20221204023857.1621757-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.83] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751249902074798337?= X-GMAIL-MSGID: =?utf-8?q?1751249902074798337?= when kmalloc() fail to allocate memory in kasprintf(), propname will be NULL, strcmp() called by of_get_property() will cause null pointer dereference. So directly return ENOMEM, if kasprintf() return NULL pointer. Fixes: 3afb50d7125b ("power: supply: core: Add some helpers to use the battery OCV capacity table") Signed-off-by: ruanjinjie --- drivers/power/supply/power_supply_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 4b5fb172fa99..2fd6ab7a4471 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -750,6 +750,8 @@ int power_supply_get_battery_info(struct power_supply *psy, int i, tab_len, size; propname = kasprintf(GFP_KERNEL, "ocv-capacity-table-%d", index); + if (!propname) + return -ENOMEM; list = of_get_property(battery_np, propname, &size); if (!list || !size) { dev_err(&psy->dev, "failed to get %s\n", propname);