]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cpufreq: CPPC: Fix possible null-ptr-deref for cppc_get_cpu_cost()
authorJinjie Ruan <ruanjinjie@huawei.com>
Wed, 30 Oct 2024 08:24:49 +0000 (16:24 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:34 +0000 (13:53 +0100)
[ Upstream commit 1a1374bb8c5926674973d849feed500bc61ad535 ]

cpufreq_cpu_get_raw() may return NULL if the cpu is not in
policy->cpus cpu mask and it will cause null pointer dereference,
so check NULL for cppc_get_cpu_cost().

Fixes: 740fcdc2c20e ("cpufreq: CPPC: Register EM based on efficiency class information")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cpufreq/cppc_cpufreq.c

index 32045075c596fe8a324d1735b7dc1f67f4f8117e..00556b4d83f83efb563381d1066e6aa3709794e9 100644 (file)
@@ -493,6 +493,9 @@ static int cppc_get_cpu_cost(struct device *cpu_dev, unsigned long KHz,
        int step;
 
        policy = cpufreq_cpu_get_raw(cpu_dev->id);
+       if (!policy)
+               return 0;
+
        cpu_data = policy->driver_data;
        perf_caps = &cpu_data->perf_caps;
        max_cap = arch_scale_cpu_capacity(cpu_dev->id);