Skip to content

Commit

Permalink
cpufreq: Fix governor module removal race
Browse files Browse the repository at this point in the history
It is possible to remove a cpufreq governor module after
cpufreq_parse_governor() has returned success in
store_scaling_governor() and before cpufreq_set_policy()
acquires a reference to it, because the governor list is
not protected during that period and nothing prevents the
governor from being unregistered then.

Prevent that from happening by acquiring an extra reference
to the governor module temporarily in cpufreq_parse_governor(),
under cpufreq_governor_mutex, and dropping it in
store_scaling_governor(), when cpufreq_set_policy() returns.

Note that the second cpufreq_parse_governor() call site is fine,
because it only cares about the policy member of new_policy.

Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
  • Loading branch information
rafaeljw committed Dec 4, 2017
1 parent 70d1ff7 commit a8b149d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@ static int cpufreq_parse_governor(char *str_governor,

t = find_governor(str_governor);
}
if (t && !try_module_get(t->owner))
t = NULL;

mutex_unlock(&cpufreq_governor_mutex);

Expand Down Expand Up @@ -766,6 +768,10 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
return -EINVAL;

ret = cpufreq_set_policy(policy, &new_policy);

if (new_policy.governor)
module_put(new_policy.governor->owner);

return ret ? ret : count;
}

Expand Down

0 comments on commit a8b149d

Please sign in to comment.