diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-07-06 04:32:27 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 16:42:48 -0300 |
commit | f7059eaa285c0460569ffd26c43ae07e3f03cd6c (patch) | |
tree | 4f31450a63b1460fcdf3b79e8f47d8b824683a60 /drivers/media/video/gspca/cpia1.c | |
parent | 02bbcb9d863df10b5a4b91ba5b4c76eaf1340883 (diff) | |
download | linux-stable-f7059eaa285c0460569ffd26c43ae07e3f03cd6c.tar.gz linux-stable-f7059eaa285c0460569ffd26c43ae07e3f03cd6c.tar.bz2 linux-stable-f7059eaa285c0460569ffd26c43ae07e3f03cd6c.zip |
V4L/DVB: gspca - main: Don't use the frame buffer flags
This patch fixes possible race conditions in queue management with SMP:
when a frame was completed, the irq function tried to use the next frame
buffer. At this time, it was possible that the application on an other
processor updated the frame pointer, making the image to point to a bad
buffer.
The patch contains two main changes:
- the image transfer uses the queue indexes which are protected against
simultaneous memory access,
- the image pointer which is used for image concatenation is only set at
interrupt level.
Some subdrivers which used the image pointer have been updated.
Reported-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/cpia1.c')
-rw-r--r-- | drivers/media/video/gspca/cpia1.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c index 4b3ea3b4bbba..3747a1dcff54 100644 --- a/drivers/media/video/gspca/cpia1.c +++ b/drivers/media/video/gspca/cpia1.c @@ -1765,14 +1765,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, atomic_set(&sd->cam_exposure, data[39] * 2); atomic_set(&sd->fps, data[41]); - image = gspca_dev->image; - if (image == NULL) { - gspca_dev->last_packet_type = DISCARD_PACKET; - return; - } - /* Check for proper EOF for last frame */ - if (gspca_dev->image_len > 4 && + image = gspca_dev->image; + if (image != NULL && + gspca_dev->image_len > 4 && image[gspca_dev->image_len - 4] == 0xff && image[gspca_dev->image_len - 3] == 0xff && image[gspca_dev->image_len - 2] == 0xff && |