From mboxrd@z Thu Jan 1 00:00:00 1970 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 97F1EC35249 for ; Mon, 3 Feb 2020 16:23:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 615162087E for ; Mon, 3 Feb 2020 16:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747004; bh=bIpEsUaKhOtc1aYG1pGJZDRAwfnJnZMBTydjPblIEN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KQe6Robaasz142ceY6GMkq7HmlpWpzVBHbPoFuuPxA7l0ma1DC6blUK9o5AH4I8Jt PvCPi6jAzt2o1LYdOiyU3891u36pllfmKT7Td3PjaLhwMPlMrvcd1DlXXCOmmH4KyD VMhrIWbtxpnkDgnaz9B9vq9TzkCQrlluZQK5uqdw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728727AbgBCQUD (ORCPT ); Mon, 3 Feb 2020 11:20:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:59622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728695AbgBCQUA (ORCPT ); Mon, 3 Feb 2020 11:20:00 -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 A3CF720CC7; Mon, 3 Feb 2020 16:19:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746800; bh=bIpEsUaKhOtc1aYG1pGJZDRAwfnJnZMBTydjPblIEN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGmAY5n+fIBrGb/Zlka33WbVd0fM4Umeu+bgFJHGtseyhVrFyGyEKHH903PPolOr2 lBzK9doAe4R6qPlORnCDOx9nhZse81YdWBi9mFNUm3BszuFzTCkUv83VM9DfwMcKTL NKz9OowbPlDRNdznYgJUqjXVJsEnvfQxfM8HWEUc= 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.4 12/53] ath9k: fix storage endpoint lookup Date: Mon, 3 Feb 2020 16:19:04 +0000 Message-Id: <20200203161905.352176468@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161902.714326084@linuxfoundation.org> References: <20200203161902.714326084@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -1211,7 +1211,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;