| From eb40bb2df732655873132cf30df879f5bab51e65 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 30 Oct 2024 09:20:19 +0800 |
| Subject: cpufreq: CPPC: Fix possible null-ptr-deref for cpufreq_cpu_get_raw() |
| |
| From: Jinjie Ruan <ruanjinjie@huawei.com> |
| |
| [ 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 | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c |
| index 0050242d382e7..d8c8363167a78 100644 |
| --- a/drivers/cpufreq/cppc_cpufreq.c |
| +++ b/drivers/cpufreq/cppc_cpufreq.c |
| @@ -422,6 +422,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); |
| -- |
| 2.43.0 |
| |
