diff options
| author | Jinjie Ruan <ruanjinjie@huawei.com> | 2024-11-06 02:12:38 +0100 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2024-11-11 05:15:16 +0100 |
| commit | be392aa80f1e5b0b65ccc2a540b9304fefcfe3d8 (patch) | |
| tree | dc22e932d6165adca1def9547ce5adb35ea46066 /drivers/cpufreq/cppc_cpufreq.c | |
| parent | cpufreq: loongson3: Check for error code from devm_mutex_init() call (diff) | |
| download | linux-be392aa80f1e5b0b65ccc2a540b9304fefcfe3d8.tar.xz linux-be392aa80f1e5b0b65ccc2a540b9304fefcfe3d8.zip | |
cpufreq: CPPC: Fix wrong return value in cppc_get_cpu_cost()
cppc_get_cpu_cost() return 0 if the policy is NULL. Then in
em_compute_costs(), the later zero check for cost is not valid
as cost is uninitialized. As Quentin pointed out, kernel energy model
core check the return value of get_cost() first, so if the callback
failed it should tell the core. Return -EINVAL to fix it.
Fixes: 1a1374bb8c59 ("cpufreq: CPPC: Fix possible null-ptr-deref for cppc_get_cpu_cost()")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/c4765377-7830-44c2-84fa-706b6e304e10@stanley.mountain/
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: Quentin Perret <qperret@google.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers/cpufreq/cppc_cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cppc_cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 956d672c6d57..4e1d0c7ccb1f 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -475,7 +475,7 @@ static int cppc_get_cpu_cost(struct device *cpu_dev, unsigned long KHz, policy = cpufreq_cpu_get_raw(cpu_dev->id); if (!policy) - return 0; + return -EINVAL; cpu_data = policy->driver_data; perf_caps = &cpu_data->perf_caps; |