1 files changed, 40 insertions, 5 deletions

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 8389c162bc89..2c5f76d588ac 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1447,6 +1447,9 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
 
         uif = udev->actconfig->interface[idx];
 
+        if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
+                return -ENODEV;
+
         dev->video_mode.end_point_addr = uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress;
         dev->video_mode.num_alt = uif->num_altsetting;
 
@@ -1460,7 +1463,12 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                 return -ENOMEM;
 
         for (i = 0; i < dev->video_mode.num_alt; i++) {
-                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);
+                u16 tmp;
+
+                if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1)
+                        return -ENODEV;
+
+                tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);
                 dev->video_mode.alt_max_pkt_size[i] = (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
                 dev_dbg(dev->dev,
                         "Alternate setting %i, max size= %i\n", i,
@@ -1477,6 +1485,9 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         }
         uif = udev->actconfig->interface[idx];
 
+        if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
+                return -ENODEV;
+
         dev->vbi_mode.end_point_addr =
             uif->altsetting[0].endpoint[isoc_pipe].desc.
                         bEndpointAddress;
@@ -1493,8 +1504,12 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                 return -ENOMEM;
 
         for (i = 0; i < dev->vbi_mode.num_alt; i++) {
-                u16 tmp =
-                    le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
+                u16 tmp;
+
+                if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1)
+                        return -ENODEV;
+
+                tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
                                 desc.wMaxPacketSize);
                 dev->vbi_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
@@ -1514,6 +1529,9 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         }
         uif = udev->actconfig->interface[idx];
 
+        if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
+                return -ENODEV;
+
         dev->sliced_cc_mode.end_point_addr =
             uif->altsetting[0].endpoint[isoc_pipe].desc.
                         bEndpointAddress;
@@ -1528,7 +1546,12 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                 return -ENOMEM;
 
         for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
-                u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
+                u16 tmp;
+
+                if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1)
+                        return -ENODEV;
+
+                tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
                                 desc.wMaxPacketSize);
                 dev->sliced_cc_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
@@ -1693,6 +1716,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 }
                 uif = udev->actconfig->interface[idx];
 
+                if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1) {
+                        retval = -ENODEV;
+                        goto err_video_alt;
+                }
+
                 dev->ts1_mode.end_point_addr =
                     uif->altsetting[0].endpoint[isoc_pipe].
                                 desc.bEndpointAddress;
@@ -1710,7 +1738,14 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 }
 
                 for (i = 0; i < dev->ts1_mode.num_alt; i++) {
-                        u16 tmp = le16_to_cpu(uif->altsetting[i].
+                        u16 tmp;
+
+                        if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1) {
+                                retval = -ENODEV;
+                                goto err_video_alt;
+                        }
+
+                        tmp = le16_to_cpu(uif->altsetting[i].
                                                 endpoint[isoc_pipe].desc.
                                                 wMaxPacketSize);
                         dev->ts1_mode.alt_max_pkt_size[i] =