From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2B64C677F1 for ; Mon, 16 Jan 2023 16:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233486AbjAPQfx (ORCPT ); Mon, 16 Jan 2023 11:35:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232987AbjAPQfX (ORCPT ); Mon, 16 Jan 2023 11:35:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AA1930B2E for ; Mon, 16 Jan 2023 08:23:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D2304B81065 for ; Mon, 16 Jan 2023 16:23:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BF9FC433D2; Mon, 16 Jan 2023 16:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673886185; bh=haax4wXJXsj13K3SzqJuv7Yqllp9vWqjgJlyNP3GA8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eanI/X1v505yu5Qij/7Dpmsa0Nah3uuNEmG/MnzTz+gzufdTr90KcOhYH0OyN08PH mNhPW6tEvO4e0m+Nzf6DcGP3SWmL57bxuXjeMi8U8K9fIk+Z96Un8RT/k3oxGhq1Y6 awskgUmf4s+UOf0sRugIFTsyJR12i0Y9B2lPpJng= 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 5.4 334/658] power: supply: fix null pointer dereferencing in power_supply_get_battery_info Date: Mon, 16 Jan 2023 16:47:02 +0100 Message-Id: <20230116154924.830111561@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 3afc0b833eb8..fd24254d9014 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -648,6 +648,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