Skip to content

Commit

Permalink
[media] gspca - sonixj: Fix a zero divide in isoc interrupt
Browse files Browse the repository at this point in the history
In case of short marker, the number of received packets was not
incremented doing a zero divide when computing the filling rate.

Reported-by: Hans Petter Selasky <hans.petter.selasky@bitfrost.no>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed May 8, 2012
1 parent f36c7d9 commit 788ab1b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/gspca/sonixj.c
Original file line number Diff line number Diff line change
@@ -2923,6 +2923,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
* not the JPEG end of frame ('ff d9').
*/

/* count the packets and their size */
sd->npkt++;
sd->pktsz += len;

/*fixme: assumption about the following code:
* - there can be only one marker in a packet
*/
@@ -2945,10 +2949,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
data += i;
}

/* count the packets and their size */
sd->npkt++;
sd->pktsz += len;

/* search backwards if there is a marker in the packet */
for (i = len - 1; --i >= 0; ) {
if (data[i] != 0xff) {

0 comments on commit 788ab1b

Please sign in to comment.