Skip to content

Commit f05c0df

Browse files
jhovoldgregkh
authored andcommitted
usbvision: fix NULL-deref at probe
commit eacb975b48272f54532b62f515a3cf7eefa35123 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: 2a9f8b5 ("V4L/DVB (5206): Usbvision: set alternate interface modification") Cc: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 14d0caf commit f05c0df

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

drivers/media/usb/usbvision/usbvision-video.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,14 @@ static int usbvision_probe(struct usb_interface *intf,
15231523
}
15241524

15251525
for (i = 0; i < usbvision->num_alt; i++) {
1526-
u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
1526+
u16 tmp;
1527+
1528+
if (uif->altsetting[i].desc.bNumEndpoints < 2) {
1529+
ret = -ENODEV;
1530+
goto err_pkt;
1531+
}
1532+
1533+
tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc.
15271534
wMaxPacketSize);
15281535
usbvision->alt_max_pkt_size[i] =
15291536
(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

0 commit comments

Comments
 (0)