Commit 982a9e01 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Greg Kroah-Hartman

V4L: buf_qbuf: fix videobuf_queue->stream corruption and lockup

We are doing ->buf_prepare(buf) before adding buf to q->stream list. This
means that videobuf_qbuf() should not try to re-add a STATE_PREPARED buffer.

(cherry picked from commit 419dd837)
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 34d39c49
...@@ -700,6 +700,7 @@ videobuf_qbuf(struct videobuf_queue *q, ...@@ -700,6 +700,7 @@ videobuf_qbuf(struct videobuf_queue *q,
goto done; goto done;
} }
if (buf->state == STATE_QUEUED || if (buf->state == STATE_QUEUED ||
buf->state == STATE_PREPARED ||
buf->state == STATE_ACTIVE) { buf->state == STATE_ACTIVE) {
dprintk(1,"qbuf: buffer is already queued or active.\n"); dprintk(1,"qbuf: buffer is already queued or active.\n");
goto done; goto done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment