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 X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 7BBB2C4321A for ; Wed, 23 Dec 2020 02:57:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AAD2206F6 for ; Wed, 23 Dec 2020 02:57:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731266AbgLWC5J (ORCPT ); Tue, 22 Dec 2020 21:57:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:49580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729089AbgLWCUs (ORCPT ); Tue, 22 Dec 2020 21:20:48 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4E7422525; Wed, 23 Dec 2020 02:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690007; bh=dWFQx3kO/XpieQ9wmZQGQXwB5w130lMudtO/Wj94Drk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmv3FA1cjQX4m+nUuesbZGk84P7uexj0einPrfLIZZsJ8L0AS9oos0jbYeaYu/oGO 7V0MS7yb9wm5hYwNvHpSJwT+kf73oOZXTZFWgqSR8bgE4VYwqFYIjcioqdLnPl9lcc DguLvRuOIYgG+EKWSZ1KevKzOaI8SPMCMvRr0KovPYGoa4DCDGVFA2xZeT3kK2Xeu9 jHxADyz9Ze9hMHPKmdITqepfRwI/PC29W0EMIW2UIHurgqNY64ZvUljAxHacI7AAaF mFFtn94+GRsGbok3neJbLoi92svG3n4nlI5AsJ5xKgIMEonioqXV6Y7svqXRS4AdWJ 6JOv2FhbxVULg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yangtao Li , Yangtao Li , Viresh Kumar , Sasha Levin , linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 088/130] cpufreq: sti-cpufreq: fix mem leak in sti_cpufreq_set_opp_info() Date: Tue, 22 Dec 2020 21:17:31 -0500 Message-Id: <20201223021813.2791612-88-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.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 2855b7878a204..858be66ee7d08 100644 --- a/drivers/cpufreq/sti-cpufreq.c +++ b/drivers/cpufreq/sti-cpufreq.c @@ -223,7 +223,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", @@ -232,6 +233,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 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 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 F3BCBC433DB for ; Wed, 23 Dec 2020 02:23:01 +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 8CB432313F for ; Wed, 23 Dec 2020 02:23:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CB432313F 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=anvr86wHnaoUifoRiU93ViCIOUy35yGRuYqCrrAlIPk=; b=HpDP3pe/16y5WpKRm9EiZsy39 vSY4U5YM0rlzQjvDpQbu8hdTzsZQBLTtCiot6MmSIhxFVE75MJpcCkhbAfCZ5XBcl8Q6n77Lasjyx 8MOGxmLlnIGNztu4IgyNHrDt5kBBUK+DhgrIkuXl5RKBWpwehV7uvQ9A+69iMK/sXHaz0LhvkpFLN 2OEXtvG2iPrUupg78ZW64uuQkBTQwAvBIH3Hp+QqpmUH/FTHc/SDxSBKA0BF13F7xf0ZcteAs4M5t /frefYs+Q4pA6DW02VFpK1hIzySzYVZabDKm8DJSSo/8y8MLUrUjvJEkKjL8qVyTlzaPhzHTEopGz 55lzs/TCg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krtlp-0000dU-RK; Wed, 23 Dec 2020 02:20:58 +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 1krtl2-0000AN-Ai for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 02:20:09 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4E7422525; Wed, 23 Dec 2020 02:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690007; bh=dWFQx3kO/XpieQ9wmZQGQXwB5w130lMudtO/Wj94Drk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmv3FA1cjQX4m+nUuesbZGk84P7uexj0einPrfLIZZsJ8L0AS9oos0jbYeaYu/oGO 7V0MS7yb9wm5hYwNvHpSJwT+kf73oOZXTZFWgqSR8bgE4VYwqFYIjcioqdLnPl9lcc DguLvRuOIYgG+EKWSZ1KevKzOaI8SPMCMvRr0KovPYGoa4DCDGVFA2xZeT3kK2Xeu9 jHxADyz9Ze9hMHPKmdITqepfRwI/PC29W0EMIW2UIHurgqNY64ZvUljAxHacI7AAaF mFFtn94+GRsGbok3neJbLoi92svG3n4nlI5AsJ5xKgIMEonioqXV6Y7svqXRS4AdWJ 6JOv2FhbxVULg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 088/130] cpufreq: sti-cpufreq: fix mem leak in sti_cpufreq_set_opp_info() Date: Tue, 22 Dec 2020 21:17:31 -0500 Message-Id: <20201223021813.2791612-88-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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_212008_525056_22646DFB X-CRM114-Status: GOOD ( 10.84 ) 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 2855b7878a204..858be66ee7d08 100644 --- a/drivers/cpufreq/sti-cpufreq.c +++ b/drivers/cpufreq/sti-cpufreq.c @@ -223,7 +223,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", @@ -232,6 +233,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