Skip to content

Commit c1384e4

Browse files
committed
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 b8f8583 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: 91a12e9 ("cpufreq: Allow light-weight tear down and bring up of CPUs") Fixes: f339f35 ("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>
2 parents 15736b2 + eb2bb94 commit c1384e4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/cpufreq/cpufreq.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,10 +1679,13 @@ static void __cpufreq_offline(unsigned int cpu, struct cpufreq_policy *policy)
16791679
*/
16801680
if (cpufreq_driver->offline) {
16811681
cpufreq_driver->offline(policy);
1682-
} else if (cpufreq_driver->exit) {
1683-
cpufreq_driver->exit(policy);
1684-
policy->freq_table = NULL;
1682+
return;
16851683
}
1684+
1685+
if (cpufreq_driver->exit)
1686+
cpufreq_driver->exit(policy);
1687+
1688+
policy->freq_table = NULL;
16861689
}
16871690

16881691
static int cpufreq_offline(unsigned int cpu)
@@ -1731,7 +1734,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
17311734
}
17321735

17331736
/* We did light-weight exit earlier, do full tear down now */
1734-
if (cpufreq_driver->offline)
1737+
if (cpufreq_driver->offline && cpufreq_driver->exit)
17351738
cpufreq_driver->exit(policy);
17361739

17371740
up_write(&policy->rwsem);

0 commit comments

Comments
 (0)