diff options
| author | Jinjie Ruan <ruanjinjie@huawei.com> | 2024-11-06 09:01:11 +0800 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2024-11-11 09:45:16 +0530 |
| commit | b51eb0874d8170028434fbd259e80b78ed9b8eca (patch) | |
| tree | 2061ae645c8717a40dee485ad88518334be1c1d5 | |
| parent | be392aa80f1e5b0b65ccc2a540b9304fefcfe3d8 (diff) | |
| download | lwn-b51eb0874d8170028434fbd259e80b78ed9b8eca.tar.gz lwn-b51eb0874d8170028434fbd259e80b78ed9b8eca.zip | |
cpufreq: CPPC: Fix wrong return value in cppc_get_cpu_power()
cppc_get_cpu_power() return 0 if the policy is NULL. Then in
em_create_perf_table(), the later zero check for power is not valid
as power is uninitialized. As Quentin pointed out, kernel energy model
core check the return value of active_power() first, so if the callback
failed it should tell the core. So return -EINVAL to fix it.
Fixes: a78e72075642 ("cpufreq: CPPC: Fix possible null-ptr-deref for cpufreq_cpu_get_raw()")
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: Quentin Perret <qperret@google.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
| -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 4e1d0c7ccb1f..c68ac76810aa 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -405,7 +405,7 @@ static int cppc_get_cpu_power(struct device *cpu_dev, 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; |