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 28E44C35247 for ; Mon, 3 Feb 2020 16:20:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8FEF20838 for ; Mon, 3 Feb 2020 16:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746809; bh=WEOklyTGlh+Dp6MrjCjwZN9Ener2BdjnE/24V39LZjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hq+nH7d9silL33KjZixepJNWDVwe2phgVYiqWPomaZxnNypsLK46Ywx6ATvEfmRfn knAuygNqkrDpnLymLoteuFWGV7LaGhWfZ0vmuvb7/zx74rUpHP2L+USjjYRaz7rb5F dJA/5WYmOBRUnMNLf7uxD89Kf17h+BqJXUvL3oM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728761AbgBCQUI (ORCPT ); Mon, 3 Feb 2020 11:20:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:59820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728756AbgBCQUH (ORCPT ); Mon, 3 Feb 2020 11:20:07 -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 B4CED2086A; Mon, 3 Feb 2020 16:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746807; bh=WEOklyTGlh+Dp6MrjCjwZN9Ener2BdjnE/24V39LZjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YLu5/51blR2jsMXz1LdtgHzMRt1J44grnCARWQd2FvdOmOTQqLcO6uJ25SXmzn1E7 notHgUJHwEFPaPvdevkAFIGaaOESQ36MCIeHwSFAME3KNQcn62n2a2FTaOU8805+Ue faXJdBN1TmkmzbCHSKz7yuO+IDsshK0RF7MWHuSs= 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 15/53] zd1211rw: fix storage endpoint lookup Date: Mon, 3 Feb 2020 16:19:07 +0000 Message-Id: <20200203161905.875457513@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit 2d68bb2687abb747558b933e80845ff31570a49c 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: a1030e92c150 ("[PATCH] zd1211rw: Convert installer CDROM device into WLAN device") Cc: stable # 2.6.19 Signed-off-by: Johan Hovold Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c @@ -1272,7 +1272,7 @@ static void print_id(struct usb_device * static int eject_installer(struct usb_interface *intf) { struct usb_device *udev = interface_to_usbdev(intf); - struct usb_host_interface *iface_desc = &intf->altsetting[0]; + struct usb_host_interface *iface_desc = intf->cur_altsetting; struct usb_endpoint_descriptor *endpoint; unsigned char *cmd; u8 bulk_out_ep;