diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-16 15:26:17 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-11 17:44:05 +0300 |
| commit | 38114f18d3c6a7e5a82b6fab03542131dcd62500 (patch) | |
| tree | e5d64642d0b396d3902770129b9ac084d58cb5ba /drivers/usb | |
| parent | 74fd1380d488617ce8a11dbf4f91ec6f0d605255 (diff) | |
| download | linux-38114f18d3c6a7e5a82b6fab03542131dcd62500.tar.xz | |
USB: usb_driver_claim_interface: add sanity checking
commit 0b818e3956fc1ad976bee791eadcbb3b5fec5bfd upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index bfddeb3bc97e..8053fab9ae69 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -463,11 +463,15 @@ static int usb_unbind_interface(struct device *dev) int usb_driver_claim_interface(struct usb_driver *driver, struct usb_interface *iface, void *priv) { - struct device *dev = &iface->dev; + struct device *dev; struct usb_device *udev; int retval = 0; int lpm_disable_error; + if (!iface) + return -ENODEV; + + dev = &iface->dev; if (dev->driver) return -EBUSY; |