Skip to content

Commit

Permalink
usb: chipidea: debug: avoid out of bound read
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heinrich Schuchardt authored and Peter Chen committed May 6, 2015
1 parent 0d3bba0 commit bd5fb0a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/usb/chipidea/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit bd5fb0a

Please sign in to comment.