]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
authorHenry Martin <bsdhenrymartin@gmail.com>
Wed, 9 Apr 2025 12:48:13 +0000 (20:48 +0800)
committerViresh Kumar <viresh.kumar@linaro.org>
Thu, 10 Apr 2025 04:37:32 +0000 (10:07 +0530)
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present
in the policy->cpus mask. apple_soc_cpufreq_get_rate() does not check
for this case, which results in a NULL pointer dereference.

Fixes: 6286bbb40576 ("cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
drivers/cpufreq/apple-soc-cpufreq.c

index 4994c86feb5738cdbc80acc740a938540b943df8..b1d29b7af232627f5c48f610bfe07d591b2728a2 100644 (file)
@@ -134,11 +134,17 @@ static const struct of_device_id apple_soc_cpufreq_of_match[] __maybe_unused = {
 
 static unsigned int apple_soc_cpufreq_get_rate(unsigned int cpu)
 {
-       struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu);
-       struct apple_cpu_priv *priv = policy->driver_data;
+       struct cpufreq_policy *policy;
+       struct apple_cpu_priv *priv;
        struct cpufreq_frequency_table *p;
        unsigned int pstate;
 
+       policy = cpufreq_cpu_get_raw(cpu);
+       if (unlikely(!policy))
+               return 0;
+
+       priv = policy->driver_data;
+
        if (priv->info->cur_pstate_mask) {
                u32 reg = readl_relaxed(priv->reg_base + APPLE_DVFS_STATUS);