diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-09-04 06:04:07 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:14:05 +0200 |
| commit | 682dbe2cb5e7090b230c7a574c0f8b3be45a6d75 (patch) | |
| tree | acf1ab543873b167bfc02d5a0a1cc022393ddfdd | |
| parent | e1bbf7d2cd2181f336d612ae47a560cb2f644427 (diff) | |
| download | linux-stable-682dbe2cb5e7090b230c7a574c0f8b3be45a6d75.tar.gz linux-stable-682dbe2cb5e7090b230c7a574c0f8b3be45a6d75.tar.bz2 linux-stable-682dbe2cb5e7090b230c7a574c0f8b3be45a6d75.zip | |
media: videobuf-core.c: poll_wait needs a non-NULL buf pointer
commit 6f51fdfd8229d5358c2d6e272cf73478866e8ddc upstream.
poll_wait uses &buf->done, but buf is NULL. Move the poll_wait to later
in the function once buf is correctly set and only call it if it is
non-NULL.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: bb436cbeb918 ("media: videobuf: fix epoll() by calling poll_wait first")
Cc: <stable@vger.kernel.org> # for v5.1 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/v4l2-core/videobuf-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c index 7ef3e4d22bf6..939fc11cf080 100644 --- a/drivers/media/v4l2-core/videobuf-core.c +++ b/drivers/media/v4l2-core/videobuf-core.c @@ -1123,7 +1123,6 @@ __poll_t videobuf_poll_stream(struct file *file, struct videobuf_buffer *buf = NULL; __poll_t rc = 0; - poll_wait(file, &buf->done, wait); videobuf_queue_lock(q); if (q->streaming) { if (!list_empty(&q->stream)) @@ -1143,7 +1142,9 @@ __poll_t videobuf_poll_stream(struct file *file, } buf = q->read_buf; } - if (!buf) + if (buf) + poll_wait(file, &buf->done, wait); + else rc = EPOLLERR; if (0 == rc) { |