Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D2CDC433DB for ; Wed, 23 Dec 2020 02:28:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D531D206EC for ; Wed, 23 Dec 2020 02:28:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D531D206EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YNOh+goXdGANZ+/RegwLeM+51LW8N26ytXEal/AZKZQ=; b=3FDKRTx+BL2gVOwCBioixqSxf RpTvP6E2W4NBdXjoFAIDysCQyA5ecUWTPhHhOSbrj0A62aXKvP6AAqqQeywbtYSpl7TdpzYbnHBBo 7QT/cBeo5AKspbdwLQk6sjli9Dpes0gIsGPRt0i4T6WFbUbNfBEyJNCz2IGXBcqz4Y6iVRpjsD9oe 2BoDjRlbkapaNWasdFlAoEGgkuGobvCQnEt0qokr8LTIYyutCcbJPQcQ+iSlCA4JqA1TeFxmjhnef JpzXKgA0+Og19sjHw0bLiPO315FC1mME8QfNat1nUhFW4gLSk9MudOBb6AOEYuWgKBIMBpYW/iNJ4 TJJoQIf9g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtqi-0003ME-B3; Wed, 23 Dec 2020 02:26:00 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtnB-0001X0-F9 for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 02:22:22 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8BC0C23355; Wed, 23 Dec 2020 02:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690140; bh=wJAXHu7zSNDaN3aC8gmRAMD2V4kupXCh6Z8grumo4Wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ro9KIr9RJGSmrgdRFDp1C6B3xbMUevOmB07QV5/l2CxdmhD6u5SFOwuXV8TROP0yD Moth2SEfGXcjZWAllarSQqrhfDdMr4bFcvScy9kinbF43zMWPBJu8RCn+Pgv9div8e f1+xH6PQL2ui+ovBTXxd0BiPij6XdkND4aB+UeF6d8p+tlh70RFKLFMqb3FQdTyI20 +/uw9E0fjmOToT4iu3aNPL5SmzzLgB7C0Aql5mIbmSYkADLXbpxeIjNhmL2dYB4nWU ArZIPJmKRBbK87Crj2T1OymHURDZNdxbzOecrWwwZMUrsUDK2B5mKRRi/q3Fojz0zD 4HveqXFEVHyQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 62/87] cpufreq: sti-cpufreq: fix mem leak in sti_cpufreq_set_opp_info() Date: Tue, 22 Dec 2020 21:20:38 -0500 Message-Id: <20201223022103.2792705-62-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022103.2792705-1-sashal@kernel.org> References: <20201223022103.2792705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201222_212221_776370_F9795C6F X-CRM114-Status: GOOD ( 10.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-pm@vger.kernel.org, Yangtao Li , Viresh Kumar , Yangtao Li , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Yangtao Li [ Upstream commit 3a5e6732a74c44d7c78a764b9a7701135565df8f ] Use dev_pm_opp_put_prop_name() to avoid mem leak, which free opp_table. Signed-off-by: Yangtao Li Signed-off-by: Yangtao Li Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/cpufreq/sti-cpufreq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c index 6b5d241c30b70..01bf9e3a85772 100644 --- a/drivers/cpufreq/sti-cpufreq.c +++ b/drivers/cpufreq/sti-cpufreq.c @@ -226,7 +226,8 @@ static int sti_cpufreq_set_opp_info(void) opp_table = dev_pm_opp_set_supported_hw(dev, version, VERSION_ELEMENTS); if (IS_ERR(opp_table)) { dev_err(dev, "Failed to set supported hardware\n"); - return PTR_ERR(opp_table); + ret = PTR_ERR(opp_table); + goto err_put_prop_name; } dev_dbg(dev, "pcode: %d major: %d minor: %d substrate: %d\n", @@ -235,6 +236,10 @@ static int sti_cpufreq_set_opp_info(void) version[0], version[1], version[2]); return 0; + +err_put_prop_name: + dev_pm_opp_put_prop_name(opp_table); + return ret; } static int sti_cpufreq_fetch_syscon_registers(void) -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel