diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-09-02 16:04:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2024-10-12 15:54:07 +0200 |
| commit | c780d01cf1a68182d515ea46a7c85746435a4004 (patch) | |
| tree | 992bb6fbcf2cd3098e017b79fa5269f935d69322 | |
| parent | 7e8ca483c0a96da6564bf7c57390e7c071fb5bae (diff) | |
| download | linux-stable-c780d01cf1a68182d515ea46a7c85746435a4004.tar.gz linux-stable-c780d01cf1a68182d515ea46a7c85746435a4004.tar.bz2 linux-stable-c780d01cf1a68182d515ea46a7c85746435a4004.zip | |
media: vb2: vb2_core_queue_init(): sanity check lock and wait_prepare/finish
Add two new checks:
1) wait_prepare and wait_finish callbacks are either both present or
both unset, you can't mix.
2) if lock == NULL, then wait_prepare (and due to check 1 also
wait_finish) must be present.
These checks should prevent the case where lock == NULL, but there
is no way to release/reacquire whatever lock is used when waiting
for a buffer to arrive in VIDIOC_DQBUF.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 29a8d876e6c2..6335ac7b771a 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -2644,6 +2644,14 @@ int vb2_core_queue_init(struct vb2_queue *q) if (WARN_ON(q->min_reqbufs_allocation > q->max_num_buffers)) return -EINVAL; + /* Either both or none are set */ + if (WARN_ON(!q->ops->wait_prepare ^ !q->ops->wait_finish)) + return -EINVAL; + + /* Warn if q->lock is NULL and no custom wait_prepare is provided */ + if (WARN_ON(!q->lock && !q->ops->wait_prepare)) + return -EINVAL; + INIT_LIST_HEAD(&q->queued_list); INIT_LIST_HEAD(&q->done_list); spin_lock_init(&q->done_lock); |