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

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

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 357dc7f4a98ced097db6c9370da9f2c26a43b507..32045075c596fe8a324d1735b7dc1f67f4f8117e 100644 (file)
@@ -423,6 +423,9 @@ static int cppc_get_cpu_power(struct device *cpu_dev,
        struct cppc_cpudata *cpu_data;
 
        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);