summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormark gross <markgross@thegnar.org>2010-09-10 01:20:09 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2010-09-11 02:53:05 +0400
commit0109c2c48d062a04685638926a35ed20153fedc8 (patch)
tree8e86dfb97b555845e99d379af6d716d5fb0ecb10
parent152e1d592071c8b312bb898bc1118b64e4aea535 (diff)
downloadlinux-0109c2c48d062a04685638926a35ed20153fedc8.tar.xz
PM QoS: Correct pr_debug() misuse and improve parameter checks
Correct some pr_debug() misuse and add a stronger parameter check to pm_qos_write() for the ASCII hex value case. Thanks to Dan Carpenter for pointing out the problem! Signed-off-by: mark gross <markgross@thegnar.org> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--kernel/pm_qos_params.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index b7e4c362361b..645e541a45f6 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -389,10 +389,12 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
} else if (count == 11) { /* len('0x12345678/0') */
if (copy_from_user(ascii_value, buf, 11))
return -EFAULT;
+ if (strlen(ascii_value) != 10)
+ return -EINVAL;
x = sscanf(ascii_value, "%x", &value);
if (x != 1)
return -EINVAL;
- pr_debug(KERN_ERR "%s, %d, 0x%x\n", ascii_value, x, value);
+ pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
} else
return -EINVAL;