Bläddra i källkod

V4L/DVB (5603): V4L: Prevent queueing queued buffers.

videobuf_qbuf queues buffers to q->stream but does not properly check
the state of the buffer before queueing. It was possible to queue
buffers that already were in the queue.
Only buffers that are in states STATE_NEEDS_INIT and STATE_IDLE can be
queued.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Sakari Ailus 18 år sedan
förälder
incheckning
36a63ee34b
1 ändrade filer med 1 tillägg och 3 borttagningar
  1. 1 3
      drivers/media/video/video-buf.c

+ 1 - 3
drivers/media/video/video-buf.c

@@ -702,9 +702,7 @@ videobuf_qbuf(struct videobuf_queue *q,
 		dprintk(1,"qbuf: memory type is wrong.\n");
 		dprintk(1,"qbuf: memory type is wrong.\n");
 		goto done;
 		goto done;
 	}
 	}
-	if (buf->state == STATE_QUEUED ||
-	    buf->state == STATE_PREPARED ||
-	    buf->state == STATE_ACTIVE) {
+	if (buf->state != STATE_NEEDS_INIT && buf->state != STATE_IDLE) {
 		dprintk(1,"qbuf: buffer is already queued or active.\n");
 		dprintk(1,"qbuf: buffer is already queued or active.\n");
 		goto done;
 		goto done;
 	}
 	}