From patchwork Mon Feb 3 16:19:09 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: 232242 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,URIBL_BLOCKED,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 E6CC7C35251 for ; Mon, 3 Feb 2020 16:25:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B30312087E for ; Mon, 3 Feb 2020 16:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747106; bh=fYBLQfioAFLXVP4+W9lqJsj8o/aOsIiqIGbkM1lhc0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vRBzS4z90vT21upFpdAXKGG8mMghYUrSDOfXsHaYu61EDIWO3KnvpwiAXojyrIh9Y KxBTqiBSnjyzH/R/aNd11bKBamHn0nTrqds3f+/ljyMZazXfK4s1hZbRrG+G2A4pRw Qq5R7fHCHKOYl0V0Rgq34wtYXPTznpm1sNjP+vt4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbgBCQZG (ORCPT ); Mon, 3 Feb 2020 11:25:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:35608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727939AbgBCQZD (ORCPT ); Mon, 3 Feb 2020 11:25:03 -0500 Received: from localhost (unknown [104.132.45.99]) (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 05B282087E; Mon, 3 Feb 2020 16:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747102; bh=fYBLQfioAFLXVP4+W9lqJsj8o/aOsIiqIGbkM1lhc0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U7U0zUDlI5b3qt3NWVxsbIOc8wSn/i1s+7OP4/8aFqhdVAZoUUFy533lb2PxzXEID 88LC/BB1Kmugtc574Uh7NRsZ7WqNxBDz67YOFuurxYUbiFojRwUlpPk081OKrKb0Qb Ss007XqJvTukTNdSLxyExsv15sQ68WmZZ4i/2lng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Kalle Valo Subject: [PATCH 4.9 13/68] ath9k: fix storage endpoint lookup Date: Mon, 3 Feb 2020 16:19:09 +0000 Message-Id: <20200203161907.090357058@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161904.705434837@linuxfoundation.org> References: <20200203161904.705434837@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 0ef332951e856efa89507cdd13ba8f4fb8d4db12 upstream. Make sure to use the current alternate setting when verifying the storage interface descriptors to avoid submitting an URB to an invalid endpoint. 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: 36bcce430657 ("ath9k_htc: Handle storage devices") Cc: stable # 2.6.39 Signed-off-by: Johan Hovold Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1213,7 +1213,7 @@ err_fw: static int send_eject_command(struct usb_interface *interface) { struct usb_device *udev = interface_to_usbdev(interface); - struct usb_host_interface *iface_desc = &interface->altsetting[0]; + struct usb_host_interface *iface_desc = interface->cur_altsetting; struct usb_endpoint_descriptor *endpoint; unsigned char *cmd; u8 bulk_out_ep;