From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Qian Cai <quic_qiancai@quicinc.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V3 1/4] cpufreq: cppc: Fix potential memleak in cppc_cpufreq_cpu_init
Date: Mon, 21 Jun 2021 14:49:34 +0530 [thread overview]
Message-ID: <579689469ed8a7dfd68dcbb41e9191472799a326.1624266901.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1624266901.git.viresh.kumar@linaro.org>
It's a classic example of memleak, we allocate something, we fail and
never free the resources.
Make sure we free all resources on policy ->init() failures.
Fixes: a28b2bfc099c ("cppc_cpufreq: replace per-cpu data array with a list")
Tested-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/cpufreq/cppc_cpufreq.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index be4f62e2c5f1..35b8ae66d1fb 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -256,6 +256,16 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu)
return NULL;
}
+static void cppc_cpufreq_put_cpu_data(struct cpufreq_policy *policy)
+{
+ struct cppc_cpudata *cpu_data = policy->driver_data;
+
+ list_del(&cpu_data->node);
+ free_cpumask_var(cpu_data->shared_cpu_map);
+ kfree(cpu_data);
+ policy->driver_data = NULL;
+}
+
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
unsigned int cpu = policy->cpu;
@@ -309,7 +319,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
default:
pr_debug("Unsupported CPU co-ord type: %d\n",
policy->shared_type);
- return -EFAULT;
+ ret = -EFAULT;
+ goto out;
}
/*
@@ -324,10 +335,14 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
cpu_data->perf_ctrls.desired_perf = caps->highest_perf;
ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
- if (ret)
- pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
- caps->highest_perf, cpu, ret);
+ if (!ret)
+ return 0;
+ pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
+ caps->highest_perf, cpu, ret);
+
+out:
+ cppc_cpufreq_put_cpu_data(policy);
return ret;
}
@@ -345,12 +360,7 @@ static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy)
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
caps->lowest_perf, cpu, ret);
- /* Remove CPU node from list and free driver data for policy */
- free_cpumask_var(cpu_data->shared_cpu_map);
- list_del(&cpu_data->node);
- kfree(policy->driver_data);
- policy->driver_data = NULL;
-
+ cppc_cpufreq_put_cpu_data(policy);
return 0;
}
--
2.31.1.272.g89b43f80a514
next prev parent reply other threads:[~2021-06-21 9:20 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 9:19 [PATCH V3 0/4] cpufreq: cppc: Add support for frequency invariance Viresh Kumar
2021-06-21 9:19 ` Viresh Kumar [this message]
2021-06-23 13:44 ` [PATCH V3 1/4] cpufreq: cppc: Fix potential memleak in cppc_cpufreq_cpu_init Ionela Voinescu
2021-06-24 2:08 ` Viresh Kumar
2021-06-24 2:10 ` [PATCH V3.1 " Viresh Kumar
2021-06-25 10:33 ` Ionela Voinescu
2021-06-21 9:19 ` [PATCH V3 2/4] cpufreq: cppc: Pass structure instance by reference Viresh Kumar
2021-06-23 13:45 ` Ionela Voinescu
2021-06-24 2:22 ` Viresh Kumar
2021-06-25 10:30 ` Ionela Voinescu
2021-06-21 9:19 ` [PATCH V3 3/4] arch_topology: Avoid use-after-free for scale_freq_data Viresh Kumar
2021-06-23 13:50 ` Ionela Voinescu
2021-06-21 9:19 ` [PATCH V3 4/4] cpufreq: CPPC: Add support for frequency invariance Viresh Kumar
2021-06-24 9:48 ` Ionela Voinescu
2021-06-24 13:04 ` Viresh Kumar
2021-06-25 8:54 ` Ionela Voinescu
2021-06-25 16:54 ` Viresh Kumar
2021-06-28 10:49 ` Ionela Voinescu
2021-06-29 4:32 ` Viresh Kumar
2021-06-29 8:47 ` Ionela Voinescu
2021-06-29 8:53 ` Viresh Kumar
2021-06-21 20:48 ` [PATCH V3 0/4] cpufreq: cppc: " Qian Cai
2021-06-22 6:52 ` Viresh Kumar
2021-06-23 4:16 ` Viresh Kumar
2021-06-23 12:57 ` Qian Cai
2021-06-24 2:54 ` Viresh Kumar
2021-06-24 9:49 ` Vincent Guittot
2021-06-24 10:48 ` Ionela Voinescu
2021-06-24 11:15 ` Vincent Guittot
2021-06-24 11:23 ` Ionela Voinescu
2021-06-24 11:59 ` Vincent Guittot
2021-06-24 15:17 ` Qian Cai
2021-06-25 10:21 ` Ionela Voinescu
2021-06-25 13:31 ` Qian Cai
2021-06-25 14:37 ` Ionela Voinescu
2021-06-25 16:56 ` Qian Cai
2021-06-26 2:29 ` Qian Cai
2021-06-26 13:41 ` Qian Cai
2021-06-29 4:55 ` Viresh Kumar
2021-06-29 4:52 ` Viresh Kumar
2021-06-29 9:06 ` Ionela Voinescu
2021-06-29 13:38 ` Qian Cai
2021-06-29 4:45 ` Viresh Kumar
2021-06-24 20:44 ` Qian Cai
2021-06-28 11:54 ` Ionela Voinescu
2021-06-28 12:14 ` Vincent Guittot
2021-06-28 12:17 ` Vincent Guittot
2021-06-28 13:08 ` Ionela Voinescu
2021-06-28 21:37 ` Ionela Voinescu
2021-06-29 8:45 ` Vincent Guittot
2021-06-29 5:20 ` Viresh Kumar
2021-06-29 8:46 ` Ionela Voinescu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=579689469ed8a7dfd68dcbb41e9191472799a326.1624266901.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=ionela.voinescu@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=quic_qiancai@quicinc.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).