These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / core / driver.c

diff --git a/kernel/drivers/usb/core/driver.c b/kernel/drivers/usb/core/driver.c
index 818369a..56593a9 100644 (file)
--- a/kernel/drivers/usb/core/driver.c
+++ b/kernel/drivers/usb/core/driver.c
@@ -160,6 +160,7 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf,
        spin_lock(&usb_driver->dynids.lock);
        list_for_each_entry_safe(dynid, n, &usb_driver->dynids.list, node) {
                struct usb_device_id *id = &dynid->id;
+
                if ((id->idVendor == idVendor) &&
                    (id->idProduct == idProduct)) {
                        list_del(&dynid->node);
@@ -295,6 +296,10 @@ static int usb_probe_interface(struct device *dev)
        if (udev->authorized == 0) {
                dev_err(&intf->dev, "Device is not authorized for usage\n");
                return error;
+       } else if (intf->authorized == 0) {
+               dev_err(&intf->dev, "Interface %d is not authorized for usage\n",
+                               intf->altsetting->desc.bInterfaceNumber);
+               return error;
        }
 
        id = usb_match_dynamic_id(intf, driver);
@@ -416,12 +421,10 @@ static int usb_unbind_interface(struct device *dev)
                if (ep->streams == 0)
                        continue;
                if (j == 0) {
-                       eps = kmalloc(USB_MAXENDPOINTS * sizeof(void *),
+                       eps = kmalloc_array(USB_MAXENDPOINTS, sizeof(void *),
                                      GFP_KERNEL);
-                       if (!eps) {
-                               dev_warn(dev, "oom, leaking streams\n");
+                       if (!eps)
                                break;
-                       }
                }
                eps[j++] = ep;
        }
@@ -507,6 +510,10 @@ int usb_driver_claim_interface(struct usb_driver *driver,
        if (dev->driver)
                return -EBUSY;
 
+       /* reject claim if interface is not authorized */
+       if (!iface->authorized)
+               return -ENODEV;
+
        udev = interface_to_usbdev(iface);
 
        dev->driver = &driver->drvwrap.driver;