aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2015-04-28 13:30:47 -0400
committerPeter Chen <peter.chen@freescale.com>2015-05-06 02:28:18 -0400
commitbd5fb0aec3dd7cde7ec4c397b10e55d4c9626d8d (patch)
tree207a768da295aac03cdfe4db7bbab0f3f97ea772
parent0d3bba0287d4e284c3ec7d3397e81eec920d5e7e (diff)
usb: chipidea: debug: avoid out of bound read
A string written by the user may not be zero terminated. sscanf may read memory beyond the buffer if no zero byte is found. For testing build with CONFIG_USB_CHIPIDEA=y, CONFIG_USB_CHIPIDEA_DEBUG=y. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Peter Chen <peter.chen@freescale.com>
-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,
88 char buf[32]; 88 char buf[32];
89 int ret; 89 int ret;
90 90
91 if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) 91 count = min_t(size_t, sizeof(buf) - 1, count);
92 if (copy_from_user(buf, ubuf, count))
92 return -EFAULT; 93 return -EFAULT;
93 94
95 /* sscanf requires a zero terminated string */
96 buf[count] = '\0';
97
94 if (sscanf(buf, "%u", &mode) != 1) 98 if (sscanf(buf, "%u", &mode) != 1)
95 return -EINVAL; 99 return -EINVAL;
96 100