diff options
| author | Johan Hovold <johan@kernel.org> | 2019-12-10 12:47:51 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-04-28 19:02:49 +0100 |
| commit | 3686b986e6663905e6799e6a5263095307b1e655 (patch) | |
| tree | 0ba797114918d33f86c50f52cca914be1d1bf1ff | |
| parent | e3f0b8a121d02d670629b530fe512e7499fc55d2 (diff) | |
| download | linux-stable-3686b986e6663905e6799e6a5263095307b1e655.tar.gz linux-stable-3686b986e6663905e6799e6a5263095307b1e655.tar.bz2 linux-stable-3686b986e6663905e6799e6a5263095307b1e655.zip | |
staging: rtl8712: fix interface sanity check
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")
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 22a28becf275..af79582dbc28 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -269,7 +269,7 @@ static uint r8712_usb_dvobj_init(struct _adapter *padapter) 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) { |