diff options
| author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:32:16 -0400 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-07-20 16:18:44 +0200 |
| commit | 0d2709ce0b6a334a15bcd5f86c006fcd6cec069d (patch) | |
| tree | a6e3d08d6cef78dbb2c1baffc79d45ea20fbc8fd | |
| parent | 5466883730e1a4ad318651f4f650eef93e75679d (diff) | |
| download | v4.4-0d2709ce0b6a334a15bcd5f86c006fcd6cec069d.tar.gz | |
UPSTREAM: USB: usbfs: fix potential infoleak in devio
The stack object “ci” has a total size of 8 bytes. Its last 3 bytes
are padding bytes which are not initialized and leaked to userland
via “copy_to_user”.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 28619695
Patchset: usbfs-devio-info-leak
(cherry-picked from 681fef8380eb818c0b845fca5d2ab1dcbab114ee)
Signed-off-by: Mattias Nissler <mnissler@google.com>
Change-Id: I7bdfdbb6f04ef788d55e4c10db785fb36cd832b2
| -rw-r--r-- | drivers/usb/core/devio.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 38ae877c46e3..3ffb01ff6549 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -1203,10 +1203,11 @@ static int proc_getdriver(struct usb_dev_state *ps, void __user *arg) static int proc_connectinfo(struct usb_dev_state *ps, void __user *arg) { - struct usbdevfs_connectinfo ci = { - .devnum = ps->dev->devnum, - .slow = ps->dev->speed == USB_SPEED_LOW - }; + struct usbdevfs_connectinfo ci; + + memset(&ci, 0, sizeof(ci)); + ci.devnum = ps->dev->devnum; + ci.slow = ps->dev->speed == USB_SPEED_LOW; if (copy_to_user(arg, &ci, sizeof(ci))) return -EFAULT; |