package/kernel/mac80211/patches/brcm/113-v5.6-brcmfmac-fix-interface-sanity-check.patch

   1 From 3428fbcd6e6c0850b1a8b2a12082b7b2aabb3da3 Mon Sep 17 00:00:00 2001
   2 From: Johan Hovold <johan@kernel.org>
   3 Date: Tue, 10 Dec 2019 12:44:22 +0100
   4 Subject: [PATCH] brcmfmac: fix interface sanity check
   5
   6 Make sure to use the current alternate setting when verifying the
   7 interface descriptors to avoid binding to an invalid interface.
   8
   9 Failing to do so could cause the driver to misbehave or trigger a WARN()
  10 in usb_submit_urb() that kernels with panic_on_warn set would choke on.
  11
  12 Fixes: 71bb244ba2fd ("brcm80211: fmac: add USB support for bcm43235/6/8 chipsets")
  13 Cc: stable <stable@vger.kernel.org>     # 3.4
  14 Cc: Arend van Spriel <arend@broadcom.com>
  15 Signed-off-by: Johan Hovold <johan@kernel.org>
  16 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  17 ---
  18  drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 ++--
  19  1 file changed, 2 insertions(+), 2 deletions(-)
  20
  21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  23 @@ -1348,7 +1348,7 @@ brcmf_usb_probe(struct usb_interface *in
  24                 goto fail;
  25         }
  26
  27 -       desc = &intf->altsetting[0].desc;
  28 +       desc = &intf->cur_altsetting->desc;
  29         if ((desc->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
  30             (desc->bInterfaceSubClass != 2) ||
  31             (desc->bInterfaceProtocol != 0xff)) {
  32 @@ -1361,7 +1361,7 @@ brcmf_usb_probe(struct usb_interface *in
  33
  34         num_of_eps = desc->bNumEndpoints;
  35         for (ep = 0; ep < num_of_eps; ep++) {
  36 -               endpoint = &intf->altsetting[0].endpoint[ep].desc;
  37 +               endpoint = &intf->cur_altsetting->endpoint[ep].desc;
  38                 endpoint_num = usb_endpoint_num(endpoint);
  39                 if (!usb_endpoint_xfer_bulk(endpoint))
  40                         continue;