All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>,
	Viresh Kumar <viresh.kumar@linaro.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: [PATCH v2 3/4] cpufreq: Fix governor module removal race
Date: Thu, 23 Nov 2017 14:27:07 +0100	[thread overview]
Message-ID: <16997374.L1f6Qxgytn@aspire.rjw.lan> (raw)
In-Reply-To: <2007526.uAUpsoPmOG@aspire.rjw.lan>

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---

-> v2: Drop changes to clear policy->governor in
       cpufreq_parse_governor() in the cpufreq_driver->setpolicy set
       case, as that field should always be NULL then.

---
 drivers/cpufreq/cpufreq.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: linux-pm/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq.c
+++ linux-pm/drivers/cpufreq/cpufreq.c
@@ -633,6 +633,8 @@ static int cpufreq_parse_governor(char *
 
 			t = find_governor(str_governor);
 		}
+		if (t && !try_module_get(t->owner))
+			t = NULL;
 
 		mutex_unlock(&cpufreq_governor_mutex);
 
@@ -766,6 +768,10 @@ static ssize_t store_scaling_governor(st
 		return -EINVAL;
 
 	ret = cpufreq_set_policy(policy, &new_policy);
+
+	if (new_policy.governor)
+		module_put(new_policy.governor->owner);
+
 	return ret ? ret : count;
 }
 

  parent reply	other threads:[~2017-11-23 13:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-23  0:21 [PATCH 0/4] cpufreq: Cleanups and governor module removal race fix Rafael J. Wysocki
2017-11-23  0:23 ` [PATCH 1/4] cpufreq: Clean up cpufreq_parse_governor() Rafael J. Wysocki
2017-11-23  3:55   ` Viresh Kumar
2017-11-23  0:24 ` [PATCH 2/4] cpufreq: Pass policy pointer to cpufreq_parse_governor() Rafael J. Wysocki
2017-11-23  3:56   ` Viresh Kumar
2017-11-23  0:29 ` [PATCH 3/4] cpufreq: Fix governor module removal race Rafael J. Wysocki
2017-11-23  4:01   ` Viresh Kumar
2017-11-23 13:16     ` Rafael J. Wysocki
2017-11-23 13:27   ` Rafael J. Wysocki [this message]
2017-11-28  2:38     ` [PATCH v2 " Viresh Kumar
2017-11-23  0:30 ` [PATCH 4/4] cpufreq: Drop pointless return statement Rafael J. Wysocki
2017-11-23  4:01   ` Viresh Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=16997374.L1f6Qxgytn@aspire.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=viresh.kumar@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.