Skip to content

Commit f346e96

Browse files
schsparafaeljw
authored andcommitted
cpufreq: Fix possible race in cpufreq online error path
When cpufreq online fails, the policy->cpus mask is not cleared and policy->rwsem is released too early, so the driver can be invoked via the cpuinfo_cur_freq sysfs attribute while its ->offline() or ->exit() callbacks are being run. Take policy->clk as an example: static int cpufreq_online(unsigned int cpu) { ... // policy->cpus != 0 at this time down_write(&policy->rwsem); ret = cpufreq_add_dev_interface(policy); up_write(&policy->rwsem); return 0; out_destroy_policy: for_each_cpu(j, policy->real_cpus) remove_cpu_dev_symlink(policy, get_cpu_device(j)); up_write(&policy->rwsem); ... out_exit_policy: if (cpufreq_driver->exit) cpufreq_driver->exit(policy); clk_put(policy->clk); // policy->clk is a wild pointer ... ^ | Another process access __cpufreq_get cpufreq_verify_current_freq cpufreq_generic_get // acces wild pointer of policy->clk; | | out_offline_policy: | cpufreq_policy_free(policy); | // deleted here, and will wait for no body reference cpufreq_policy_put_kobj(policy); } Address this by modifying cpufreq_online() to release policy->rwsem in the error path after the driver callbacks have run and to clear policy->cpus before releasing the semaphore. Fixes: 7106e02 ("cpufreq: release policy->rwsem on error") Signed-off-by: Schspa Shi <schspa@gmail.com> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent addca28 commit f346e96

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/cpufreq/cpufreq.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,8 +1533,6 @@ static int cpufreq_online(unsigned int cpu)
15331533
for_each_cpu(j, policy->real_cpus)
15341534
remove_cpu_dev_symlink(policy, get_cpu_device(j));
15351535

1536-
up_write(&policy->rwsem);
1537-
15381536
out_offline_policy:
15391537
if (cpufreq_driver->offline)
15401538
cpufreq_driver->offline(policy);
@@ -1543,6 +1541,9 @@ static int cpufreq_online(unsigned int cpu)
15431541
if (cpufreq_driver->exit)
15441542
cpufreq_driver->exit(policy);
15451543

1544+
cpumask_clear(policy->cpus);
1545+
up_write(&policy->rwsem);
1546+
15461547
out_free_policy:
15471548
cpufreq_policy_free(policy);
15481549
return ret;

0 commit comments

Comments
 (0)