lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 194/219] cpufreq: Fix governor module removal race
    Date
    From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

    [ Upstream commit a8b149d32b663c1a4105273295184b78f53d33cf ]

    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 <rafael.j.wysocki@intel.com>
    Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/cpufreq/cpufreq.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
    index 35e34c0e0429..94d42448d403 100644
    --- a/drivers/cpufreq/cpufreq.c
    +++ b/drivers/cpufreq/cpufreq.c
    @@ -605,6 +605,8 @@ static int cpufreq_parse_governor(char *str_governor, unsigned int *policy,
    *governor = t;
    err = 0;
    }
    + if (t && !try_module_get(t->owner))
    + t = NULL;

    mutex_unlock(&cpufreq_governor_mutex);
    }
    @@ -723,6 +725,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;
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:26    [W:4.995 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site