diff options
| author | Kangjie Lu <kangjielu@gmail.com> | 2016-05-03 16:32:16 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:37:18 +0100 |
| commit | 05b352b3503450e32a6b3b4fad6358d7bf1290f5 (patch) | |
| tree | 7c9fb3ff36105f3b4e03857f768d64a8a93c5ae2 | |
| parent | cf3069a14a9cccdd89d2b482f9eee5e37ebe25a6 (diff) | |
| download | linux-stable-05b352b3503450e32a6b3b4fad6358d7bf1290f5.tar.gz linux-stable-05b352b3503450e32a6b3b4fad6358d7bf1290f5.tar.bz2 linux-stable-05b352b3503450e32a6b3b4fad6358d7bf1290f5.zip | |
USB: usbfs: fix potential infoleak in devio
commit 681fef8380eb818c0b845fca5d2ab1dcbab114ee upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 64340f3e0792..ed11901ab8ab 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -1005,10 +1005,11 @@ static int proc_getdriver(struct dev_state *ps, void __user *arg) static int proc_connectinfo(struct 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; |