From patchwork Mon Mar 13 12:35:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9620599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10C5C604A9 for ; Mon, 13 Mar 2017 12:36:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F40D22848E for ; Mon, 13 Mar 2017 12:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E81DF28495; Mon, 13 Mar 2017 12:36:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97C532848E for ; Mon, 13 Mar 2017 12:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555AbdCMMge (ORCPT ); Mon, 13 Mar 2017 08:36:34 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:32771 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752249AbdCMMgV (ORCPT ); Mon, 13 Mar 2017 08:36:21 -0400 Received: by mail-lf0-f66.google.com with SMTP id r36so11747262lfi.0; Mon, 13 Mar 2017 05:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ABeVcy0fSo+3QUfX6GvfvUy4fOJQY93LFw83xG/rkbc=; b=Tj/Lih66ssEyawp+PuqAmhhUbrqFUBp600b9fKrhegHtoDqH1w1b3188IScXr/K/98 eZQbgSfIS511/9d24REHVql7O5lZCuXEaOSoa5bWnoWYEBjk8pXooaFjZPLFpq5E5yrn gBQ2R/n3i8EgFxyfQN33HjcJJCtZJBQlZyHdTMGp52OO5PQ3guLQN2ThEqLAEJqSyfX6 b8IshvM07kwGJslNQxYS3iWq1wYuV2V/KiY6qWWqmDLuuqA5/PtObQcF1bBQ/ZHVqETW Hg1Ald89BMSNY/EuXRNeXp+eUIAN99/4JDXSZWg25HTfTHOudhMQjxySEmK+tgwkSrxr 09Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ABeVcy0fSo+3QUfX6GvfvUy4fOJQY93LFw83xG/rkbc=; b=bU0idVN0QPEeAEyVqGo5F4JrQUZKd36/Ear/c6ix6PfJOkdWvW78wxKCMdi1KI1STj 4knshEJJQF8SLBN2idpoP+gScWVIVhQdoQmuyVRjqSaHJ2xSTvyf61cbfFKHaTEaZAaR IlosU5gKzpZgMmBRuRBASG35O3k+ICM4J+Dfg7QwWiF3p7tSu2FXNGby1BQ7XCA6sJnt ZL2MuvSqS6ynXjh/l2yKi7VekO3OXdszPbzJxk41LBBhJdmqsq4dOIfVyiCsSB9ouF6m qHSnfeWlm4DMSWeiGh4Vq+QoWuEF9T7rgpobXHla3+L6mw3O4Bma0SrR/e94axsj9OuT gJ2w== X-Gm-Message-State: AMke39lVGB1fDMTlQJYOvDdrQ3OLT0xRm6DsXD1bP2FbYDCZpWZt67dugyJUSNqmYLgyYg== X-Received: by 10.46.83.67 with SMTP id t3mr9740550ljd.102.1489408578218; Mon, 13 Mar 2017 05:36:18 -0700 (PDT) Received: from xi.terra ([84.216.234.102]) by smtp.gmail.com with ESMTPSA id t125sm3552753lff.31.2017.03.13.05.36.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 05:36:16 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1cnPCo-0007Kb-SO; Mon, 13 Mar 2017 13:36:06 +0100 From: Johan Hovold To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Florian Echtler , David Herrmann , Henrik Rydberg Subject: [PATCH 7/7] Input: sur40 - fix NULL-deref at probe Date: Mon, 13 Mar 2017 13:35:39 +0100 Message-Id: <20170313123539.28103-8-johan@kernel.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170313123539.28103-1-johan@kernel.org> References: <20170313123539.28103-1-johan@kernel.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer or accessing memory that lie beyond the end of the endpoint array should a malicious device lack the expected endpoints. Fixes: bdb5c57f209c ("Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)") Cc: stable # 3.13 Cc: Florian Echtler Cc: David Herrmann Cc: Henrik Rydberg Signed-off-by: Johan Hovold --- drivers/input/touchscreen/sur40.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index aefb6e11f88a..4c0eecae065c 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -527,6 +527,9 @@ static int sur40_probe(struct usb_interface *interface, if (iface_desc->desc.bInterfaceClass != 0xFF) return -ENODEV; + if (iface_desc->desc.bNumEndpoints < 5) + return -ENODEV; + /* Use endpoint #4 (0x86). */ endpoint = &iface_desc->endpoint[4].desc; if (endpoint->bEndpointAddress != TOUCH_ENDPOINT)