Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966306AbcDLSIR (ORCPT ); Tue, 12 Apr 2016 14:08:17 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49043 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966269AbcDLSIN (ORCPT ); Tue, 12 Apr 2016 14:08:13 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Josh Boyer , Dmitry Torokhov , Moritz Muehlenhoff , Luis Henriques Subject: [PATCH 3.16.y-ckt 02/17] Input: powermate - fix oops with malicious USB descriptors Date: Tue, 12 Apr 2016 19:07:49 +0100 Message-Id: <1460484484-22395-3-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> References: <1460484484-22395-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1454 Lines: 39 3.16.7-ckt27 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Josh Boyer 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 Signed-off-by: Josh Boyer Signed-off-by: Dmitry Torokhov Cc: Moritz Muehlenhoff Signed-off-by: Luis Henriques --- drivers/input/misc/powermate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 63b539d3daba..84909a12ff36 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c @@ -307,6 +307,9 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i 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;