40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From de0784bdf6314b70c69416d8c576eb83237d5b1e Mon Sep 17 00:00:00 2001
|
|
From: Oliver Neukum <oneukum@suse.com>
|
|
Date: Wed, 16 Mar 2016 12:26:17 -0400
|
|
Subject: [PATCH] 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
|
|
---
|
|
drivers/usb/core/driver.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
|
|
index 6b5063e7943f..e2d242b68d4b 100644
|
|
--- a/drivers/usb/core/driver.c
|
|
+++ b/drivers/usb/core/driver.c
|
|
@@ -500,11 +500,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;
|
|
|
|
--
|
|
2.5.0
|
|
|