qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: cpufreq: exit() callback is optional 

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4613

JIRA: https://issues.redhat.com/browse/RHEL-43846  
CVE: CVE-2024-38615

commit b8f85833c05730d631576008daaa34096bc7f3ce  
Author: Viresh Kumar viresh.kumar@linaro.org  
Date: Fri Apr 12 11:19:20 2024 +0530

The exit() callback is optional and shouldn't be called without checking a valid pointer first.

Also, we must clear freq_table pointer even if the exit() callback isn't present.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>   
Fixes: 91a12e91dc ("cpufreq: Allow light-weight tear down and bring up of CPUs")  
Fixes: f339f3541701 ("cpufreq: Rearrange locking in cpufreq_remove_dev()")  
Reported-by: Lizhe <sensor1010@163.com>    
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>   
Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>

Approved-by: Lenny Szubowicz <lszubowi@redhat.com>
Approved-by: David Arcari <darcari@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Lucas Zampieri <lzampier@redhat.com>
This commit is contained in:
Lucas Zampieri 2024-07-12 14:15:02 +00:00
parent 15736b273d eb2bb94974
commit c1384e4985
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/cpufreq/cpufreq.c
View File

@ -1679,10 +1679,13 @@ static void __cpufreq_offline(unsigned int cpu, struct cpufreq_policy *policy)
*/
if (cpufreq_driver->offline) {
cpufreq_driver->offline(policy);
} else if (cpufreq_driver->exit) {
cpufreq_driver->exit(policy);
policy->freq_table = NULL;
return;
}
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
policy->freq_table = NULL;
}
static int cpufreq_offline(unsigned int cpu)
@ -1731,7 +1734,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
}
/* We did light-weight exit earlier, do full tear down now */
if (cpufreq_driver->offline)
if (cpufreq_driver->offline && cpufreq_driver->exit)
cpufreq_driver->exit(policy);
up_write(&policy->rwsem);