cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
[ Upstream commit 73b24dc731731edf762f9454552cb3a5b7224949 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present
in the policy->cpus mask. scpi_cpufreq_get_rate() does not check for
this case, which results in a NULL pointer dereference.
Fixes: 343a8d17fa ("cpufreq: scpi: remove arm_big_little dependency")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7ccfadfb25
commit
28fbd7b13b
@@ -29,9 +29,16 @@ static struct scpi_ops *scpi_ops;
|
|||||||
|
|
||||||
static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
|
static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
|
||||||
{
|
{
|
||||||
struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);
|
struct cpufreq_policy *policy;
|
||||||
struct scpi_data *priv = policy->driver_data;
|
struct scpi_data *priv;
|
||||||
unsigned long rate = clk_get_rate(priv->clk);
|
unsigned long rate;
|
||||||
|
|
||||||
|
policy = cpufreq_cpu_get_raw(cpu);
|
||||||
|
if (unlikely(!policy))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
priv = policy->driver_data;
|
||||||
|
rate = clk_get_rate(priv->clk);
|
||||||
|
|
||||||
return rate / 1000;
|
return rate / 1000;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user