[PATCH 3.2 045/115] USB: usb_driver_claim_interface: add sanity checking

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.2 045/115] USB: usb_driver_claim_interface: add sanity checking
Date	Wed, 27 Apr 2016 01:30:03 +0200
Message-ID	<rskAz-7Vw-55@gated-at.bofh.it> (permalink)
References	<rskqS-7Qj-19@gated-at.bofh.it>
Content-Type	text/plain; charset="UTF-8"
Content-Disposition	inline
Content-Transfer-Encoding	8bit
MIME-Version	1.0
X-Mailer	LinuxStableQueue (scripts by bwh)
X-Sa-Exim-Connect-IP	2a02:8426:ae4:c500:9cba:69ae:962d:6167
X-Sa-Exim-Mail-From	ben@decadent.org.uk
X-Sa-Exim-Scanned	No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	37
Organization	linux.* mail to news gateway
X-Original-Cc	akpm@linux-foundation.org, "Oliver Neukum" <ONeukum@suse.com>, "Oliver Neukum" <oneukum@suse.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
X-Original-Date	Wed, 27 Apr 2016 01:02:24 +0200
X-Original-Message-ID	<lsq.1461711744.14997211@decadent.org.uk>
X-Original-References	<lsq.1461711744.351546278@decadent.org.uk>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1388266

Show key headers only | View raw

3.2.80-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Oliver Neukum <oneukum@suse.com>

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/usb/core/driver.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -428,9 +428,13 @@ static int usb_unbind_interface(struct d
 int usb_driver_claim_interface(struct usb_driver *driver,
 				struct usb_interface *iface, void *priv)
 {
-	struct device *dev = &iface->dev;
+	struct device *dev;
 	int retval = 0;
 
+	if (!iface)
+		return -ENODEV;
+
+	dev = &iface->dev;
 	if (dev->driver)
 		return -EBUSY;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.2 045/115] USB: usb_driver_claim_interface: add sanity  checking Ben Hutchings <ben@decadent.org.uk> - 2016-04-27 01:30 +0200

csiph-web