From patchwork Tue Jan 28 14:08:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 621B4C33CB3 for ; Tue, 28 Jan 2020 14:27:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F9B221739 for ; Tue, 28 Jan 2020 14:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221649; bh=ClzRhY20vh1VhccPsTDb3PIDknispVqEK0Br7DxT5QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=USa6VkWdHKLHfyWC0Cp/LuZ10t/7a42vaulhfc7UpBmIJpNpXNC1fsGD6yXXYQAI7 YDupuXCQXk/8uMOE3XtJCc2ztbfsCvjegYlaHxevrd5yPKS+jFeBtSQgE4NvFCnPbT Uv7TUGt8eeUnT0g42CRTDaHr0pZ1kSjyPpoGtvhc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733296AbgA1O12 (ORCPT ); Tue, 28 Jan 2020 09:27:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:55242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733153AbgA1O12 (ORCPT ); Tue, 28 Jan 2020 09:27:28 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2CC4624688; Tue, 28 Jan 2020 14:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221647; bh=ClzRhY20vh1VhccPsTDb3PIDknispVqEK0Br7DxT5QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CkcOm3gUB9v0ZHtrp4Lt9C/eA86+4lRMLsXn5iR+bhEjJZmhgSjOAgnzvJ8/pITpM e/Wb6ylT6cSLY+n/fcTxmqe0kHW1OKK1WEm+o5axyJt5Ke/2z0iNucYNQjqliAWWBZ yUBhigKVZ59Ck/7qFw5YUXgXPQJvOWz0YeiuQmIA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Vladis Dronov , Dmitry Torokhov Subject: [PATCH 4.19 34/92] Input: sur40 - fix interface sanity checks Date: Tue, 28 Jan 2020 15:08:02 +0100 Message-Id: <20200128135813.455366620@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135809.344954797@linuxfoundation.org> References: <20200128135809.344954797@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit 6b32391ed675827f8425a414abbc6fbd54ea54fe upstream. Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface. This in turn could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on. Fixes: bdb5c57f209c ("Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)") Signed-off-by: Johan Hovold Acked-by: Vladis Dronov Link: https://lore.kernel.org/r/20191210113737.4016-8-johan@kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/touchscreen/sur40.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -657,7 +657,7 @@ static int sur40_probe(struct usb_interf int error; /* Check if we really have the right interface. */ - iface_desc = &interface->altsetting[0]; + iface_desc = interface->cur_altsetting; if (iface_desc->desc.bInterfaceClass != 0xFF) return -ENODEV;