summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-07-10 10:21:40 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-10-12 15:28:05 +0100
commit114e0337e1b6f67628e8817648f233759eeb4ca5 (patch)
tree22f1780adc50f5d8e88bdb2ed0c3c5a8f270dbec
parent6614442bb0e21454bacb94aeefa26cad248cfd83 (diff)
downloadlinux-stable-114e0337e1b6f67628e8817648f233759eeb4ca5.tar.gz
linux-stable-114e0337e1b6f67628e8817648f233759eeb4ca5.tar.bz2
linux-stable-114e0337e1b6f67628e8817648f233759eeb4ca5.zip
PM / QoS: return -EINVAL for bogus strings
commit 2ca30331c156ca9e97643ad05dd8930b8fe78b01 upstream. In the current code, if the user accidentally writes a bogus command to this sysfs file, then we set the latency tolerance to an uninitialized variable. Fixes: 2d984ad132a8 (PM / QoS: Introcuce latency tolerance device PM QoS type) Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/base/power/sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 95b181d1ca6d..0ed019c8012f 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -272,6 +272,8 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev,
value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;
else if (!strcmp(buf, "any") || !strcmp(buf, "any\n"))
value = PM_QOS_LATENCY_ANY;
+ else
+ return -EINVAL;
}
ret = dev_pm_qos_update_user_latency_tolerance(dev, value);
return ret < 0 ? ret : n;