diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-12 14:42:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-12 14:42:24 -0700 |
| commit | bfb9253e65197bb0f4924d686834e64bd8b64e4c (patch) | |
| tree | 5a5ee3c2109d5f93fe80980bb005f6750cfe4ac8 | |
| parent | f1a35480ec9be6507698cbaf55053b9966df0b1b (diff) | |
| parent | 3ae1cdb5b1c54402d32c01fef845c763c278bf83 (diff) | |
Merge "USB: usbfs: fix potential infoleak in devio"
| -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; |