From patchwork Mon Dec 5 07:51:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 29575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2119937wrr; Mon, 5 Dec 2022 00:02:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf49XWGC6qN+buDPOiZRcb6OrB9BBdH8r58s+MwAA4LuLjFDXEWJPU/h51FUinJrj3954E1z X-Received: by 2002:a05:6402:5308:b0:460:19c3:2992 with SMTP id eo8-20020a056402530800b0046019c32992mr7832013edb.1.1670227378055; Mon, 05 Dec 2022 00:02:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670227378; cv=none; d=google.com; s=arc-20160816; b=VVe8+iGFJslDT/WrR/rTmdZPjSHG8XXJq87DIDR/eRzmPqLM0h/xGCrTpmuOPSrH2B WquvNbPH7SDonJNKCx4cpwlFbfrIZ7DpMwvC/N4qq3kzxpIdQrdPNpZwaSyIxTKMnw/6 W0gO705JLoDPuD4ciEzPlVyEfSScN/Xq+yAZP9waMQGHs26r+yQcZBeIPegesXuGge/4 fspYTCeScSXK3dj5E2fdbuOqQ6rjHHWRLGBixLV7+AQFBFojotzFwU5KyFJvrYMkzJTG +iVnPKbqHqhsSrAV1tvko/adspRE3VMvheoUZ8bPHUb6PEK6shMAKHO5WuuRvV7YznwM AD1Q== 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=XZKq0GY1ZPkqf8xz2h1pa0C/rnC5VYCr0KsidJ8xVYQ=; b=CgTrhvK8vSf98l+H+L3BG/U2tRFctGqqojdMBx4cfZCCnuGynMSO6ZnlhdwvZ0zr6h dIUoCQywSKSwkytMfYFBxR++sZ3bA4jD05barbhJF7+0q8ddHT/W65WjUQtDBCvqEd/y jCee4SKR56avjFlKs3B2J0HsquVCU/xI2kQFg5lZMDRESVyNgVnJEdEOpJp7eEVoWM6G VPgqX7dTR8//KJUoeEeLMFbGmZMiTJ1Yp0rvffcDRK30RfIYJeGzoEp2kJTXTYIyEa7F uCp9D8ARoVf8eUl3KXdIetoiZIGdXQem2gJfjA05eAOB9p3jbPvk58fbMOiKqATIkx2E 7EOQ== 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 qf17-20020a1709077f1100b007adf16570c3si11702199ejc.17.2022.12.05.00.02.32; Mon, 05 Dec 2022 00:02:58 -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 S231817AbiLEHzP (ORCPT + 99 others); Mon, 5 Dec 2022 02:55:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231708AbiLEHzD (ORCPT ); Mon, 5 Dec 2022 02:55:03 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1B8511160; Sun, 4 Dec 2022 23:54:58 -0800 (PST) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NQbMz6wBXzkXr0; Mon, 5 Dec 2022 15:51:27 +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; Mon, 5 Dec 2022 15:54:56 +0800 From: ruanjinjie To: , , , , CC: Subject: [PATCH v2] power: supply: fix null pointer dereferencing in power_supply_get_battery_info Date: Mon, 5 Dec 2022 15:51:53 +0800 Message-ID: <20221205075153.2830393-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: dggems705-chm.china.huawei.com (10.3.19.182) 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?1751360343002949884?= X-GMAIL-MSGID: =?utf-8?q?1751360343002949884?= when kmalloc() fail to allocate memory in kasprintf(), propname will be NULL, strcmp() called by of_get_property() will cause null pointer dereference. So 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 Reviewed-by: Baolin Wang --- v2: - release resource instead of just returning error number --- drivers/power/supply/power_supply_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 4b5fb172fa99..afbe9eecfc30 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -750,6 +750,11 @@ 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) { + power_supply_put_battery_info(psy, info); + err = -ENOMEM; + goto out_put_node; + } list = of_get_property(battery_np, propname, &size); if (!list || !size) { dev_err(&psy->dev, "failed to get %s\n", propname);