| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 10 Dec 2019 12:44:26 +0100 |
| Subject: zd1211rw: fix storage endpoint lookup |
| |
| 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") |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| [bwh: Backported to 3.16: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| 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; |
