From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 69E721C07 for ; Wed, 28 Dec 2022 16:27:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB086C433D2; Wed, 28 Dec 2022 16:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1672244857; bh=N0wOss2sXsEJ1JrPeouKT2TQdEIfFK+X0WORntzDtfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSk0UYd1mpJ2fEaL45RMnrIYT32q0xlpU2yhQGXCCFskkTyYXFjfUhOacJ2nY4SpS ibHLzkKVkvb/y2ycVKJuo8IJMpOIp/57KJozRUYhPHTOw/aaJu8rBeH3a4qnBNqmun Te/3tBym2oTOj2gk88OZjkyE+/viuriAN26iq7tg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ruanjinjie , Baolin Wang , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.0 0754/1073] power: supply: fix null pointer dereferencing in power_supply_get_battery_info Date: Wed, 28 Dec 2022 15:39:02 +0100 Message-Id: <20221228144348.498895716@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221228144328.162723588@linuxfoundation.org> References: <20221228144328.162723588@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: ruanjinjie [ Upstream commit 104bb8a663451404a26331263ce5b96c34504049 ] 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 Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- 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 9bae94d2ea3a..01d1ac79d982 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); -- 2.35.1