Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934259AbcCNONH (ORCPT ); Mon, 14 Mar 2016 10:13:07 -0400 Received: from mail-yw0-f171.google.com ([209.85.161.171]:33864 "EHLO mail-yw0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755000AbcCNONE (ORCPT ); Mon, 14 Mar 2016 10:13:04 -0400 From: Josh Boyer To: Dmitry Torokhov , Greg Kroah-Hartman Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable Subject: [PATCH] USB: input: powermate: fix oops with malicious USB descriptors Date: Mon, 14 Mar 2016 10:12:53 -0400 Message-Id: <1457964773-29512-1-git-send-email-jwboyer@fedoraproject.org> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1081 Lines: 31 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 Cc: stable Signed-off-by: Josh Boyer --- 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; -- 2.5.0