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 6E25EC677F1 for ; Mon, 16 Jan 2023 16:27:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233173AbjAPQ1H (ORCPT ); Mon, 16 Jan 2023 11:27:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233084AbjAPQ0l (ORCPT ); Mon, 16 Jan 2023 11:26:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC11D27D52 for ; Mon, 16 Jan 2023 08:14:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 7918160FDF for ; Mon, 16 Jan 2023 16:14:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BBD5C433EF; Mon, 16 Jan 2023 16:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673885682; bh=TIE2sObVWWJA3hlPG4oaNLsrf4hsiGg54YPFUHuWiKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4JEDLMww+qEtdvIU27e7AjP2rgU2OpBY09MkTFYfwNIZqGm7x1lDy9S4+seZmz8K NildchSkd6uLomQ2r7LDTUMAcc9hQ0p6bR10/fRf54uXOZShlspgxdhG05rlHw8Y6q FcOkudq+HuzhEcefgLeA2F+f6oT/CcijjCSaWECs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wang ShaoBo , Mark Brown , Sasha Levin Subject: [PATCH 5.4 144/658] regulator: core: use kfree_const() to free space conditionally Date: Mon, 16 Jan 2023 16:43:52 +0100 Message-Id: <20230116154916.047272279@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: Wang ShaoBo [ Upstream commit dc8d006d15b623c1d80b90b45d6dcb6e890dad09 ] Use kfree_const() to free supply_name conditionally in create_regulator() as supply_name may be allocated from kmalloc() or directly from .rodata section. Fixes: 87fe29b61f95 ("regulator: push allocations in create_regulator() outside of lock") Signed-off-by: Wang ShaoBo Link: https://lore.kernel.org/r/20221123034616.3609537-1-bobo.shaobowang@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index ee71dcb009bf..9b4783bf63f7 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1604,7 +1604,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, regulator = kzalloc(sizeof(*regulator), GFP_KERNEL); if (regulator == NULL) { - kfree(supply_name); + kfree_const(supply_name); return NULL; } -- 2.35.1