Commit 79548079 authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

cx231xx-cards: fix NULL-deref at probe

commit 0cd273bb upstream.

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

Fixes: e0d3bafd ("V4L/DVB (10954): Add cx231xx USB driver")

Cc: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 6e9ffe1a
...@@ -1159,6 +1159,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1159,6 +1159,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
uif = udev->actconfig->interface[dev->current_pcb_config. uif = udev->actconfig->interface[dev->current_pcb_config.
hs_config_info[0].interface_info.video_index + 1]; hs_config_info[0].interface_info.video_index + 1];
if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
return -ENODEV;
dev->video_mode.end_point_addr = le16_to_cpu(uif->altsetting[0]. dev->video_mode.end_point_addr = le16_to_cpu(uif->altsetting[0].
endpoint[isoc_pipe].desc.bEndpointAddress); endpoint[isoc_pipe].desc.bEndpointAddress);
...@@ -1176,8 +1179,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1176,8 +1179,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
} }
for (i = 0; i < dev->video_mode.num_alt; i++) { for (i = 0; i < dev->video_mode.num_alt; i++) {
u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe]. u16 tmp;
desc.wMaxPacketSize);
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] = dev->video_mode.alt_max_pkt_size[i] =
(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1); (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
cx231xx_info("Alternate setting %i, max size= %i\n", i, cx231xx_info("Alternate setting %i, max size= %i\n", i,
...@@ -1189,6 +1196,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1189,6 +1196,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
hs_config_info[0].interface_info. hs_config_info[0].interface_info.
vanc_index + 1]; vanc_index + 1];
if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
return -ENODEV;
dev->vbi_mode.end_point_addr = dev->vbi_mode.end_point_addr =
le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc. le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
bEndpointAddress); bEndpointAddress);
...@@ -1207,8 +1217,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1207,8 +1217,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
} }
for (i = 0; i < dev->vbi_mode.num_alt; i++) { for (i = 0; i < dev->vbi_mode.num_alt; i++) {
u16 tmp = u16 tmp;
le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1)
return -ENODEV;
tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
desc.wMaxPacketSize); desc.wMaxPacketSize);
dev->vbi_mode.alt_max_pkt_size[i] = dev->vbi_mode.alt_max_pkt_size[i] =
(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1); (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
...@@ -1221,6 +1235,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1221,6 +1235,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
hs_config_info[0].interface_info. hs_config_info[0].interface_info.
hanc_index + 1]; hanc_index + 1];
if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1)
return -ENODEV;
dev->sliced_cc_mode.end_point_addr = dev->sliced_cc_mode.end_point_addr =
le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc. le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].desc.
bEndpointAddress); bEndpointAddress);
...@@ -1239,7 +1256,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1239,7 +1256,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
} }
for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) { 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); desc.wMaxPacketSize);
dev->sliced_cc_mode.alt_max_pkt_size[i] = dev->sliced_cc_mode.alt_max_pkt_size[i] =
(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1); (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
...@@ -1254,6 +1276,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1254,6 +1276,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
interface_info. interface_info.
ts1_index + 1]; ts1_index + 1];
if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1) {
retval = -ENODEV;
goto err_video_alt;
}
dev->ts1_mode.end_point_addr = dev->ts1_mode.end_point_addr =
le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe]. le16_to_cpu(uif->altsetting[0].endpoint[isoc_pipe].
desc.bEndpointAddress); desc.bEndpointAddress);
...@@ -1272,7 +1299,14 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1272,7 +1299,14 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
} }
for (i = 0; i < dev->ts1_mode.num_alt; i++) { 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. endpoint[isoc_pipe].desc.
wMaxPacketSize); wMaxPacketSize);
dev->ts1_mode.alt_max_pkt_size[i] = dev->ts1_mode.alt_max_pkt_size[i] =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment