summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-09 18:24:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-09 18:24:44 +0200
commit17aeca11ec4938f166fe9f66b98fb61131de4aba (patch)
treed24a124c42ce5ee2248f8ada1575e043acbcac08 /drivers/usb
parent99c605a344d7cee3c61fe02b704323f02873f686 (diff)
parentbd5fb0aec3dd7cde7ec4c397b10e55d4c9626d8d (diff)
Merge tag 'usb-ci-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus
Peter writes: Only a small fix for /sys entry
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/chipidea/debug.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index dfb05edcdb96..5b7061a33103 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -88,9 +88,13 @@ static ssize_t ci_port_test_write(struct file *file, const char __user *ubuf,
char buf[32];
int ret;
- if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+ count = min_t(size_t, sizeof(buf) - 1, count);
+ if (copy_from_user(buf, ubuf, count))
return -EFAULT;
+ /* sscanf requires a zero terminated string */
+ buf[count] = '\0';
+
if (sscanf(buf, "%u", &mode) != 1)
return -EINVAL;