summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2019-12-10 12:47:50 +0100
committerBen Hutchings <ben@decadent.org.uk>2020-04-28 19:02:49 +0100
commite3f0b8a121d02d670629b530fe512e7499fc55d2 (patch)
tree02a92bdb7e6151f20f4da3cb0c1a68cba2b8b534 /drivers/staging
parentb7cfafc259c53fbc353b3f3b319249150614bab6 (diff)
downloadlinux-stable-e3f0b8a121d02d670629b530fe512e7499fc55d2.tar.gz
linux-stable-e3f0b8a121d02d670629b530fe512e7499fc55d2.tar.bz2
linux-stable-e3f0b8a121d02d670629b530fe512e7499fc55d2.zip
staging: rtl8188eu: fix interface sanity check
commit 74ca34118a0e05793935d804ccffcedd6eb56596 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: c2478d39076b ("staging: r8188eu: Add files for new driver - part 20") Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://lore.kernel.org/r/20191210114751.5119-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8188eu/os_dep/usb_intf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 1000e87faa73..82db2ea2ed16 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -141,7 +141,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
phost_conf = pusbd->actconfig;
pconf_desc = &phost_conf->desc;
- phost_iface = &usb_intf->altsetting[0];
+ phost_iface = usb_intf->cur_altsetting;
piface_desc = &phost_iface->desc;
pdvobjpriv->NumInterfaces = pconf_desc->bNumInterfaces;