| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 10 Dec 2019 12:44:23 +0100 |
| Subject: orinoco_usb: fix interface sanity check |
| |
| commit b73e05aa543cf8db4f4927e36952360d71291d41 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: 9afac70a7305 ("orinoco: add orinoco_usb driver") |
| 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/orinoco/orinoco_usb.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/wireless/orinoco/orinoco_usb.c |
| +++ b/drivers/net/wireless/orinoco/orinoco_usb.c |
| @@ -1602,9 +1602,9 @@ static int ezusb_probe(struct usb_interf |
| /* set up the endpoint information */ |
| /* check out the endpoints */ |
| |
| - iface_desc = &interface->altsetting[0].desc; |
| + iface_desc = &interface->cur_altsetting->desc; |
| for (i = 0; i < iface_desc->bNumEndpoints; ++i) { |
| - ep = &interface->altsetting[0].endpoint[i].desc; |
| + ep = &interface->cur_altsetting->endpoint[i].desc; |
| |
| if (((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) |
| == USB_DIR_IN) && |
