| Message ID | 20241106010111.2404387-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | viresh kumar |
| Headers | show |
| Series | [-next] cpufreq: CPPC: Fix wrong return value in cppc_get_cpu_power() | expand |
On 06-11-24, 09:01, Jinjie Ruan wrote: > 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> > --- > drivers/cpufreq/cppc_cpufreq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c > index cdc569cf7743..bd8f75accfa0 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; Applied. Thanks.
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index cdc569cf7743..bd8f75accfa0 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;
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> --- drivers/cpufreq/cppc_cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)