| Message ID | 20250205181347.2079272-1-aboorvad@linux.ibm.com (mailing list archive) |
|---|---|
| State | Queued |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | [1/1] cpufreq: prevent NULL dereference in cpufreq_online | expand |
On Wed, Feb 5, 2025 at 7:14 PM Aboorva Devarajan <aboorvad@linux.ibm.com> wrote: > > Ensure `cpufreq_driver->set_boost` is non-NULL before using it in > `cpufreq_online` to prevent a potential NULL pointer dereference. > > Reported-by: Gautam Menghani <gautam@linux.ibm.com> > Closes: https://lore.kernel.org/all/c9e56c5f54cc33338762c94e9bed7b5a0d5de812.camel@linux.ibm.com/ > Fixes: dd016f379ebc ("cpufreq: Introduce a more generic way to set default per-policy boost flag") > Suggested-by: Viresh Kumar <viresh.kumar@linaro.org> > Signed-off-by: Aboorva Devarajan <aboorvad@linux.ibm.com> > --- > drivers/cpufreq/cpufreq.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index e0048856ecee..30ffbddc7ece 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -1571,7 +1571,8 @@ static int cpufreq_online(unsigned int cpu) > policy->cdev = of_cpufreq_cooling_register(policy); > > /* Let the per-policy boost flag mirror the cpufreq_driver boost during init */ > - if (policy->boost_enabled != cpufreq_boost_enabled()) { > + if (cpufreq_driver->set_boost && > + policy->boost_enabled != cpufreq_boost_enabled()) { > policy->boost_enabled = cpufreq_boost_enabled(); > ret = cpufreq_driver->set_boost(policy, policy->boost_enabled); > if (ret) { > -- Applied as 6.14-rc material, thanks!
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index e0048856ecee..30ffbddc7ece 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1571,7 +1571,8 @@ static int cpufreq_online(unsigned int cpu) policy->cdev = of_cpufreq_cooling_register(policy); /* Let the per-policy boost flag mirror the cpufreq_driver boost during init */ - if (policy->boost_enabled != cpufreq_boost_enabled()) { + if (cpufreq_driver->set_boost && + policy->boost_enabled != cpufreq_boost_enabled()) { policy->boost_enabled = cpufreq_boost_enabled(); ret = cpufreq_driver->set_boost(policy, policy->boost_enabled); if (ret) {
Ensure `cpufreq_driver->set_boost` is non-NULL before using it in `cpufreq_online` to prevent a potential NULL pointer dereference. Reported-by: Gautam Menghani <gautam@linux.ibm.com> Closes: https://lore.kernel.org/all/c9e56c5f54cc33338762c94e9bed7b5a0d5de812.camel@linux.ibm.com/ Fixes: dd016f379ebc ("cpufreq: Introduce a more generic way to set default per-policy boost flag") Suggested-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Aboorva Devarajan <aboorvad@linux.ibm.com> --- drivers/cpufreq/cpufreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)