From: Oliver Neukum <oneukum@suse.com>
Date: Wed, 16 Mar 2016 12:26:17 +0000 (+0100)
Subject: USB: usb_driver_claim_interface: add sanity checking
X-Git-Tag: v4.1.12-92~150^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=422ccb4985cd9feeb1b34f5bcc41fd74248526e5;p=users%2Fjedix%2Flinux-maple.git

USB: usb_driver_claim_interface: add sanity checking

Orabug: 23331128

[ Upstream commit 0b818e3956fc1ad976bee791eadcbb3b5fec5bfd ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit febfaffe4aa9b0600028f46f50156e3354e34208)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 818369afff63..7792c0e2d3b6 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -499,11 +499,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;