Skip to content

Commit 0b818e3

Browse files
oneukumgregkh
authored andcommitted
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>
1 parent 7222c83 commit 0b818e3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/usb/core/driver.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,15 @@ static int usb_unbind_interface(struct device *dev)
502502
int usb_driver_claim_interface(struct usb_driver *driver,
503503
struct usb_interface *iface, void *priv)
504504
{
505-
struct device *dev = &iface->dev;
505+
struct device *dev;
506506
struct usb_device *udev;
507507
int retval = 0;
508508
int lpm_disable_error;
509509

510+
if (!iface)
511+
return -ENODEV;
512+
513+
dev = &iface->dev;
510514
if (dev->driver)
511515
return -EBUSY;
512516

0 commit comments

Comments
 (0)