From: Jinjie Ruan Date: Wed, 6 Nov 2024 01:01:11 +0000 (+0800) Subject: cpufreq: CPPC: Fix wrong return value in cppc_get_cpu_power() X-Git-Tag: v6.13-rc1~107^2~1^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b51eb0874d8170028434fbd259e80b78ed9b8eca;p=thirdparty%2Fkernel%2Flinux.git 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 Suggested-by: Quentin Perret Signed-off-by: Viresh Kumar --- diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 4e1d0c7ccb1f9..c68ac76810aac 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;