Commit 0f9b4296 authored by Aboorva Devarajan's avatar Aboorva Devarajan Committed by Lifeng Zheng
Browse files

cpufreq: prevent NULL dereference in cpufreq_online() 

mainline inclusion
from mainline-v6.7-rc5
commit 0813fd2e14ca6ecd4e6ba005a9766f08e26020d7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBQYEH
CVE: NA

Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0813fd2e14ca6ecd4e6ba005a9766f08e26020d7



---------------------------------------------------------------------

Ensure cpufreq_driver->set_boost is non-NULL before using it in
cpufreq_online() to prevent a potential NULL pointer dereference.

Reported-by: default avatarGautam Menghani <gautam@linux.ibm.com>
Closes: https://lore.kernel.org/all/c9e56c5f54cc33338762c94e9bed7b5a0d5de812.camel@linux.ibm.com/


Fixes: da59223d340c ("cpufreq: Introduce a more generic way to set default per-policy boost flag")
Suggested-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarAboorva Devarajan <aboorvad@linux.ibm.com>
Link: https://patch.msgid.link/20250205181347.2079272-1-aboorvad@linux.ibm.com


[ rjw: Minor edits in the subject and changelog ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarXinghai Cen <cenxinghai@h-partners.com>
parent 8efb4f6e

drivers/cpufreq/cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -1582,7 +1582,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) {