Browse Source

USB: usb_driver_claim_interface: add sanity checking

Attacks that trick drivers into passing a NULL pointer
to usb_driver_claim_interface() using forged descriptors are
known. This thwarts them by sanity checking.

Signed-off-by: Oliver Neukum <ONeukum@suse.com>
CC: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oliver Neukum 9 years ago
parent
commit
0b818e3956
1 changed files with 5 additions and 1 deletions
  1. 5 1
      drivers/usb/core/driver.c

+ 5 - 1
drivers/usb/core/driver.c

@@ -502,11 +502,15 @@ static int usb_unbind_interface(struct device *dev)
 int usb_driver_claim_interface(struct usb_driver *driver,
 int usb_driver_claim_interface(struct usb_driver *driver,
 				struct usb_interface *iface, void *priv)
 				struct usb_interface *iface, void *priv)
 {
 {
-	struct device *dev = &iface->dev;
+	struct device *dev;
 	struct usb_device *udev;
 	struct usb_device *udev;
 	int retval = 0;
 	int retval = 0;
 	int lpm_disable_error;
 	int lpm_disable_error;
 
 
+	if (!iface)
+		return -ENODEV;
+
+	dev = &iface->dev;
 	if (dev->driver)
 	if (dev->driver)
 		return -EBUSY;
 		return -EBUSY;