diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2018-11-08 13:23:37 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-11-23 12:21:27 +0100 |
| commit | 62dcb4f41836bd3c44b5b651bb6df07ea4cb1551 (patch) | |
| tree | e8e3f62c0a3cdbe4c22daacf1875a1c465cd5a1a /drivers/media/common | |
| parent | media: adv*/tc358743/ths8200: fill in min width/height/pixelclock (diff) | |
| download | linux-62dcb4f41836bd3c44b5b651bb6df07ea4cb1551.tar.xz linux-62dcb4f41836bd3c44b5b651bb6df07ea4cb1551.zip | |
media: vb2: check memory model for VIDIOC_CREATE_BUFS
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>
Diffstat (limited to 'drivers/media/common')
| -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 2fcab61b8ff5..03954c13024c 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -812,6 +812,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); |