diff options
author | Javi Merino <javi.merino@arm.com> | 2014-11-25 11:00:33 -0500 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-07 23:10:44 -0500 |
commit | b6cc772f64ac7d1917770406844b73a94ca5ef06 (patch) | |
tree | 91a4036308f97df59865b02f5b941b799ddd1755 | |
parent | 84ffe3ecc2c8b3effc41c0babd2cc24f1edb2aab (diff) |
thermal: lock the thermal zone when switching governors
Currently, userspace can request a governor change while the governor
itself is running. Grab the thermal zone lock when changing the
governor to prevent this race.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r-- | drivers/thermal/thermal_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 5aa57736fa9e..7b723c7c4cae 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c | |||
@@ -757,6 +757,7 @@ policy_store(struct device *dev, struct device_attribute *attr, | |||
757 | snprintf(name, sizeof(name), "%s", buf); | 757 | snprintf(name, sizeof(name), "%s", buf); |
758 | 758 | ||
759 | mutex_lock(&thermal_governor_lock); | 759 | mutex_lock(&thermal_governor_lock); |
760 | mutex_lock(&tz->lock); | ||
760 | 761 | ||
761 | gov = __find_governor(strim(name)); | 762 | gov = __find_governor(strim(name)); |
762 | if (!gov) | 763 | if (!gov) |
@@ -766,6 +767,7 @@ policy_store(struct device *dev, struct device_attribute *attr, | |||
766 | ret = count; | 767 | ret = count; |
767 | 768 | ||
768 | exit: | 769 | exit: |
770 | mutex_unlock(&tz->lock); | ||
769 | mutex_unlock(&thermal_governor_lock); | 771 | mutex_unlock(&thermal_governor_lock); |
770 | return ret; | 772 | return ret; |
771 | } | 773 | } |