mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-20 01:20:54 +00:00
Code Issues Releases Wiki Activity

[media] gspca - main: Check the isoc packet status before its length

Browse source 
When an error is set for an isochronous packet, the length of the packet
may be null. In this case, the error was not detected and the image
was not discarded as it should be.

Reported-by: Franck Bourdonnec <fbourdonnec@chez.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-François Moine 2010-12-25 13:22:21 -03:00 committed by Mauro Carvalho Chehab
parent f2c5d92ecd
commit 76ebc16b87
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/video/gspca/gspca.c
View file

@ -320,12 +320,6 @@ static void fill_frame(struct gspca_dev *gspca_dev,
for (i = 0; i < urb->number_of_packets; i++) { for (i = 0; i < urb->number_of_packets; i++) {
/* check the packet status and length */ /* check the packet status and length */
len = urb->iso_frame_desc[i].actual_length;
if (len == 0) {
if (gspca_dev->empty_packet == 0)
gspca_dev->empty_packet = 1;
continue;
}
st = urb->iso_frame_desc[i].status; st = urb->iso_frame_desc[i].status;
if (st) { if (st) {
err("ISOC data error: [%d] len=%d, status=%d", err("ISOC data error: [%d] len=%d, status=%d",
@ -333,6 +327,12 @@ static void fill_frame(struct gspca_dev *gspca_dev,
gspca_dev->last_packet_type = DISCARD_PACKET; gspca_dev->last_packet_type = DISCARD_PACKET;
continue; continue;
} }
len = urb->iso_frame_desc[i].actual_length;
if (len == 0) {
if (gspca_dev->empty_packet == 0)
gspca_dev->empty_packet = 1;
continue;
}
/* let the packet be analyzed by the subdriver */ /* let the packet be analyzed by the subdriver */
PDEBUG(D_PACK, "packet [%d] o:%d l:%d", PDEBUG(D_PACK, "packet [%d] o:%d l:%d",