| From c724f776f048538ecfdf53a52b7a522309f5c504 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 10 Dec 2019 12:47:51 +0100 |
| Subject: staging: rtl8712: fix interface sanity check |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit c724f776f048538ecfdf53a52b7a522309f5c504 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: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel") |
| Cc: stable <stable@vger.kernel.org> # 2.6.37 |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Link: https://lore.kernel.org/r/20191210114751.5119-3-johan@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/rtl8712/usb_intf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/staging/rtl8712/usb_intf.c |
| +++ b/drivers/staging/rtl8712/usb_intf.c |
| @@ -268,7 +268,7 @@ static uint r8712_usb_dvobj_init(struct |
| pdev_desc = &pusbd->descriptor; |
| phost_conf = pusbd->actconfig; |
| pconf_desc = &phost_conf->desc; |
| - phost_iface = &pintf->altsetting[0]; |
| + phost_iface = pintf->cur_altsetting; |
| piface_desc = &phost_iface->desc; |
| pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints; |
| if (pusbd->speed == USB_SPEED_HIGH) { |
