From patchwork Tue Mar 29 17:25:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 603097 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 3qZHkC6Pksz9s5g; Wed, 30 Mar 2016 04:26:11 +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 1akxP5-0004gx-AW; Tue, 29 Mar 2016 17:26:07 +0000 Received: from mail-pa0-f66.google.com ([209.85.220.66]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1akxOn-0004Z0-Vi for kernel-team@lists.ubuntu.com; Tue, 29 Mar 2016 17:25:50 +0000 Received: by mail-pa0-f66.google.com with SMTP id q6so3227369pav.0 for ; Tue, 29 Mar 2016 10:25:49 -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=gq7Ev9oq93SgzMVboO88iCZztyrhwK/NSwIg8BrtylU=; b=dgkNUPrkkfBWYqDVdUH1xQ+wwPovTQ/51rF6TC0mrrO4DR3KNi3NTyjMnWjlsEzq+6 9Jq2oJZy2N23lj/HIKaFLDfRyGyO6rycpAJVf2jDMmqw0TLy4GYv6tx8yx9JX9VUz+tP EEkgXPFVwIhxkKDCmqvKp9KKPI5fYYycgk34xnolvmhuiTGSqKt/PXFMbmphiGrFuj0n C4WTfywoalh2QmvkkTPYL23IRpw93YvJQ+YTU3UmRj9AGA+taoFKQh9sQrZsFeqFiUTt pBO3vcpOMWczUOtN5Hm5PQRViVLMChH1qvK964QH5aJOA1RCEVXPJk2B4w2VFKy9e9ME qu+A== X-Gm-Message-State: AD7BkJJY4v1T7xGKQ4UCyDZQMvHUag9fc1qCRoDOPJ2TKqwRKU+rMKfhAqqE/BwqrFLlTQ== X-Received: by 10.66.159.232 with SMTP id xf8mr5352286pab.71.1459272348696; Tue, 29 Mar 2016 10:25:48 -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 f66sm44636305pff.8.2016.03.29.10.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2016 10:25:48 -0700 (PDT) Received: from kamal by fourier with local (Exim 4.86_2) (envelope-from ) id 1akxOk-0000Ju-Ft; Tue, 29 Mar 2016 10:25:46 -0700 From: Kamal Mostafa To: Josh Boyer Subject: [4.2.y-ckt stable] Patch "Input: powermate - fix oops with malicious USB descriptors" has been added to the 4.2.y-ckt tree Date: Tue, 29 Mar 2016 10:25:45 -0700 Message-Id: <1459272345-1195-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 X-Extended-Stable: 4.2 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-4.2.y-queue branch of the 4.2.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue This patch is scheduled to be released in version 4.2.8-ckt7. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 4.2.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ---8<------------------------------------------------------------ From 570d6777335a778ad00e18ee68f115beb9d728ca 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;