Commit 73b24dc7 authored by Henry Martin's avatar Henry Martin Committed by Viresh Kumar
Browse files

cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() 



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: 343a8d17 ("cpufreq: scpi: remove arm_big_little dependency")
Signed-off-by: default avatarHenry Martin <bsdhenrymartin@gmail.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 484d3f15

drivers/cpufreq/scpi-cpufreq.c

+10 −3
Original line number Diff line number Diff line
@@ -29,9 +29,16 @@ static struct scpi_ops *scpi_ops; 


static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);

	struct scpi_data *priv = policy->driver_data;

	unsigned long rate = clk_get_rate(priv->clk);

	struct cpufreq_policy *policy;

	struct scpi_data *priv;

	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;

}