From patchwork Thu Jan 30 18:38: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: 232314 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=unavailable 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 74373C2D0DB for ; Thu, 30 Jan 2020 18:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E34B20CC7 for ; Thu, 30 Jan 2020 18:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410365; bh=LUJ1SViBsO0sH8k8QprJ9hxKXgXrgwcmXehoLdRiQ+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B5lUT0uxd2YBxYjR3lxev0rR4gvORH3G7tYiPEN5K9uXH1PFxODpfYJbwyWzS7R2d bklKLWCptAfy5Qmi+OLs+PDLmDAGJ/3HYJ3gF0fJRAzUY08q8r1eacjUZO4epx2IjU ryRmdsGYi5lPiekjOhM8WaIEUHzALrynJxqlO2Ls= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730542AbgA3SnK (ORCPT ); Thu, 30 Jan 2020 13:43:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:51706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730538AbgA3SnJ (ORCPT ); Thu, 30 Jan 2020 13:43:09 -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 A3462205F4; Thu, 30 Jan 2020 18:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409789; bh=LUJ1SViBsO0sH8k8QprJ9hxKXgXrgwcmXehoLdRiQ+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fYPdpyhO0wKoJrkWhJBoSB6XtOV6khKRp+pGlJ94i7pkz3F5us5TsAQiwN1QWckG8 5sn/j1nd0lkUh9rRcdSOQ53nQS0/JHrlv4bteSpGpCProXCfDDm2eyLnL/Flnn8yBf w9Rt7ZB2Qh+TIJ2oZnaHp2qv5mCUiTAW6OK0MQfY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jes Sorensen , Johan Hovold , Kalle Valo Subject: [PATCH 5.4 033/110] rtl8xxxu: fix interface sanity check Date: Thu, 30 Jan 2020 19:38:09 +0100 Message-Id: <20200130183619.304143354@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@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 39a4281c312f2d226c710bc656ce380c621a2b16 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: 26f1fad29ad9 ("New driver: rtl8xxxu (mac80211)") Cc: stable # 4.4 Cc: Jes Sorensen Signed-off-by: Johan Hovold Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -5915,7 +5915,7 @@ static int rtl8xxxu_parse_usb(struct rtl u8 dir, xtype, num; int ret = 0; - host_interface = &interface->altsetting[0]; + host_interface = interface->cur_altsetting; interface_desc = &host_interface->desc; endpoints = interface_desc->bNumEndpoints;