Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.

Fixes: c4018fa2e4c0 ("[media] dib0700: fix RC support on Hauppauge
Nova-TD")
Cc: stable <sta...@vger.kernel.org>     # 3.16
Cc: Mauro Carvalho Chehab <mche...@kernel.org>
Signed-off-by: Johan Hovold <jo...@kernel.org>
---
 drivers/media/usb/dvb-usb/dib0700_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c 
b/drivers/media/usb/dvb-usb/dib0700_core.c
index dd5edd3a17ee..08acdd32e412 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -809,6 +809,9 @@ int dib0700_rc_setup(struct dvb_usb_device *d, struct 
usb_interface *intf)
 
        /* Starting in firmware 1.20, the RC info is provided on a bulk pipe */
 
+       if (intf->altsetting[0].desc.bNumEndpoints < rc_ep + 1)
+               return -ENODEV;
+
        purb = usb_alloc_urb(0, GFP_KERNEL);
        if (purb == NULL)
                return -ENOMEM;
-- 
2.12.0

Reply via email to