From patchwork Thu Jan 30 18:38:19 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: 232401 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 4B109C35240 for ; Thu, 30 Jan 2020 18:40:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A6392082E for ; Thu, 30 Jan 2020 18:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409620; bh=ITckDNbzz/TzTQNnL3xhySzEkpTq0zAHIzS2Ots334w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LR/otIiC2qjQ1WFjjJru5Zs1WOo5TpH3A6JQHeWSVNAgDkoqM8fy0Ulgq7b5E2SG6 262Kan3/hP0/7Hi6kVOTo2T4wVZw8YhE5MHd+n4dQUynJijhMeWZkCd+6RzhBEJmCb 64x9k41ffQvnT59wCqPhr1JpQPn8XFITmQGs3mSA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729896AbgA3SkS (ORCPT ); Thu, 30 Jan 2020 13:40:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:47692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727993AbgA3SkN (ORCPT ); Thu, 30 Jan 2020 13:40:13 -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 4154320702; Thu, 30 Jan 2020 18:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409611; bh=ITckDNbzz/TzTQNnL3xhySzEkpTq0zAHIzS2Ots334w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QDnDLgoRapQaO4jl/rSSa1OhLeZ+baryrBeHMQnxFsq8pYzg1PDoHwhAYqpVX3NM3 Cr5h98idoSUiWyVfoWI8hOo2YOwwiZ1UyxP2lHPzyAyi3sIjdbpDq37RtG2ZNYz2Qd AkFg7XdmxJ8ZOOeWaz94/gi4zMIRvhMd3JshzUJI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Kalle Valo Subject: [PATCH 5.5 02/56] orinoco_usb: fix interface sanity check Date: Thu, 30 Jan 2020 19:38:19 +0100 Message-Id: <20200130183609.410847643@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183608.849023566@linuxfoundation.org> References: <20200130183608.849023566@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 b73e05aa543cf8db4f4927e36952360d71291d41 upstream. Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface. Failing to do so 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: 9afac70a7305 ("orinoco: add orinoco_usb driver") Cc: stable # 2.6.35 Signed-off-by: Johan Hovold Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c @@ -1608,9 +1608,9 @@ static int ezusb_probe(struct usb_interf /* set up the endpoint information */ /* check out the endpoints */ - iface_desc = &interface->altsetting[0].desc; + iface_desc = &interface->cur_altsetting->desc; for (i = 0; i < iface_desc->bNumEndpoints; ++i) { - ep = &interface->altsetting[0].endpoint[i].desc; + ep = &interface->cur_altsetting->endpoint[i].desc; if (usb_endpoint_is_bulk_in(ep)) { /* we found a bulk in endpoint */