[PATCH 3.2 032/115] Input: powermate - fix oops with malicious USB descriptors

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.2 032/115] Input: powermate - fix oops with malicious USB descriptors
Date	2016-04-27 01:40 +0200
Message-ID	<rskKe-80r-19@gated-at.bofh.it> (permalink)
References	<rskqS-7Qj-19@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

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

From: Josh Boyer <jwboyer@fedoraproject.org>

commit 9c6ba456711687b794dcf285856fc14e2c76074f upstream.

The powermate driver expects at least one valid USB endpoint in its
probe function.  If given malicious descriptors that specify 0 for
the number of endpoints, it will crash.  Validate the number of
endpoints on the interface before using them.

The full report for this issue can be found here:
http://seclists.org/bugtraq/2016/Mar/85

Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/input/misc/powermate.c | 3 +++
 1 file changed, 3 insertions(+)

--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -304,6 +304,9 @@ static int powermate_probe(struct usb_in
 	int error = -ENOMEM;
 
 	interface = intf->cur_altsetting;
+	if (interface->desc.bNumEndpoints < 1)
+		return -EINVAL;
+
 	endpoint = &interface->endpoint[0].desc;
 	if (!usb_endpoint_is_int_in(endpoint))
 		return -EIO;

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

Thread

[PATCH 3.2 032/115] Input: powermate - fix oops with malicious  USB descriptors Ben Hutchings <ben@decadent.org.uk> - 2016-04-27 01:40 +0200

csiph-web