diff options
| author | Hans Verkuil | 2018-11-08 13:23:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-09 17:38:47 +0100 |
| commit | 245fc1c7f688c8e6e5fe7076973a414755d18cf0 (patch) | |
| tree | 82482dc875313bc8cf8fb23f0319ca9e02395992 | |
| parent | media: vivid: free bitmap_cap when updating std/timings/etc. (diff) | |
| download | kernel-qcow2-linux-245fc1c7f688c8e6e5fe7076973a414755d18cf0.tar.gz kernel-qcow2-linux-245fc1c7f688c8e6e5fe7076973a414755d18cf0.tar.xz kernel-qcow2-linux-245fc1c7f688c8e6e5fe7076973a414755d18cf0.zip | |
media: vb2: check memory model for VIDIOC_CREATE_BUFS
commit 62dcb4f41836bd3c44b5b651bb6df07ea4cb1551 upstream.
vb2_core_create_bufs did not check if the memory model for newly added
buffers is the same as for already existing buffers. It should return an
error if they aren't the same.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: syzbot+e1fb118a2ebb88031d21@syzkaller.appspotmail.com
Cc: <stable@vger.kernel.org> # for v4.16 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/common/videobuf2/videobuf2-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 16c7b20cbf61..1faa64abc74f 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -800,6 +800,9 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, memset(q->alloc_devs, 0, sizeof(q->alloc_devs)); q->memory = memory; q->waiting_for_buffers = !q->is_output; + } else if (q->memory != memory) { + dprintk(1, "memory model mismatch\n"); + return -EINVAL; } num_buffers = min(*count, VB2_MAX_FRAME - q->num_buffers); |