evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "USB: usbfs: fix potential infoleak in devio"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-12 14:42:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit bfb9253e65
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/core/devio.c
View file

@ -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) static int proc_connectinfo(struct usb_dev_state *ps, void __user *arg)
{ {
struct usbdevfs_connectinfo ci = { struct usbdevfs_connectinfo ci;
.devnum = ps->dev->devnum,
.slow = ps->dev->speed == USB_SPEED_LOW 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))) if (copy_to_user(arg, &ci, sizeof(ci)))
return -EFAULT; return -EFAULT;