| From 624c5f74f8b749d359ebc783067a163159c505da Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Fri, 3 Jan 2020 17:35:13 +0100 |
| Subject: [PATCH] media: iguanair: fix endpoint sanity check |
| |
| commit 1b257870a78b0a9ce98fdfb052c58542022ffb5b upstream. |
| |
| Make sure to use the current alternate setting, which need not be the |
| first one by index, when verifying the endpoint descriptors and |
| initialising the URBs. |
| |
| 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: 26ff63137c45 ("[media] Add support for the IguanaWorks USB IR Transceiver") |
| Fixes: ab1cbdf159be ("media: iguanair: add sanity checks") |
| Cc: stable <stable@vger.kernel.org> # 3.6 |
| Cc: Oliver Neukum <oneukum@suse.com> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Sean Young <sean@mess.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c |
| index 872d6441e512..a7deca1fefb7 100644 |
| --- a/drivers/media/rc/iguanair.c |
| +++ b/drivers/media/rc/iguanair.c |
| @@ -413,7 +413,7 @@ static int iguanair_probe(struct usb_interface *intf, |
| int ret, pipein, pipeout; |
| struct usb_host_interface *idesc; |
| |
| - idesc = intf->altsetting; |
| + idesc = intf->cur_altsetting; |
| if (idesc->desc.bNumEndpoints < 2) |
| return -ENODEV; |
| |
| -- |
| 2.7.4 |
| |
