Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Oliver Neukum and committed by
Greg Kroah-Hartman
0b818e39 7222c832

+5 -1
+5 -1
drivers/usb/core/driver.c
··· 502 502 int usb_driver_claim_interface(struct usb_driver *driver, 503 503 struct usb_interface *iface, void *priv) 504 504 { 505 - struct device *dev = &iface->dev; 505 + struct device *dev; 506 506 struct usb_device *udev; 507 507 int retval = 0; 508 508 int lpm_disable_error; 509 509 510 + if (!iface) 511 + return -ENODEV; 512 + 513 + dev = &iface->dev; 510 514 if (dev->driver) 511 515 return -EBUSY; 512 516