From patchwork Tue Mar 29 17:22:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 603082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3qZHfj17zVz9sBm; Wed, 30 Mar 2016 04:23:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1akxMA-0004Gq-Tg; Tue, 29 Mar 2016 17:23:06 +0000 Received: from mail-pf0-f194.google.com ([209.85.192.194]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1akxM6-0004Fv-2y for kernel-team@lists.ubuntu.com; Tue, 29 Mar 2016 17:23:02 +0000 Received: by mail-pf0-f194.google.com with SMTP id n5so3447181pfn.1 for ; Tue, 29 Mar 2016 10:23:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NMJmOIQPcYXbP6GFnorYZqbyAn2rllwyYkgVaXqPwI4=; b=lgxIwDYx0Dr0Bf5o5W8Y9Io87XFbJprcLl8uauQQy/D4s2X+Y77os6908cw2rTOpbS QS2i6VPUIIeFSV8O2gZXBk+bYDjzWtxs8xRHbd8p56m49JERn7s+DWu5+/8FabqmDXXr GyeuRpp6Umn28hOkIM/H8cDULVfztD3iuh1EHdZTmIHfk3jnP5oqbdYtvDa3QIzSUTN0 cdoO/PKD3eaKJMqnkzY5zdmcUsyXBpqDYsC80BY+SV4VNwQ40AkcL6Psri8+/+X/otcR Hmz+dqNeNYb+pUNgvvStlpTQA4ZcrS3FrVpKVedHKvQ9ZrgaZdeJ021F0dd16LdD7t0s tOcQ== X-Gm-Message-State: AD7BkJIThCQ37waTnBERu0a81KrYd3uGKv7zR1DcgLUJr0usuh7QDE8EdcAu3Q8eZiCPUg== X-Received: by 10.98.15.17 with SMTP id x17mr5444025pfi.52.1459272180747; Tue, 29 Mar 2016 10:23:00 -0700 (PDT) Received: from fourier (c-76-126-59-13.hsd1.ca.comcast.net. [76.126.59.13]) by smtp.gmail.com with ESMTPSA id n74sm44630801pfa.45.2016.03.29.10.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2016 10:23:00 -0700 (PDT) Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1akxM2-00005Z-K8; Tue, 29 Mar 2016 10:22:58 -0700 From: Kamal Mostafa To: Josh Boyer Subject: [3.19.y-ckt stable] Patch "Input: powermate - fix oops with malicious USB descriptors" has been added to the 3.19.y-ckt tree Date: Tue, 29 Mar 2016 10:22:57 -0700 Message-Id: <1459272177-306-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 X-Extended-Stable: 3.19 Cc: Ralf Spenneberg , Dmitry Torokhov , Kamal Mostafa , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled Input: powermate - fix oops with malicious USB descriptors to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue This patch is scheduled to be released in version 3.18.8-ckt18. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.19.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ---8<------------------------------------------------------------ From 6e6b91bea3c0b7b226758d72eb94391449c31cd8 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 14 Mar 2016 09:33:40 -0700 Subject: Input: powermate - fix oops with malicious USB descriptors 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 Signed-off-by: Kamal Mostafa --- drivers/input/misc/powermate.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 63b539d..84909a1 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;