On 09/19/2013 09:37 AM, Philipp Zabel wrote:
> __setup_offsets fills the v4l2_planes' mem_offset fields, which is only valid
> for V4L2_MEMORY_MMAP type buffers. For V4L2_MEMORY_DMABUF and _USERPTR
> buffers,
> this incorrectly overwrites the fd and userptr fields.
>
> Reported-by: Michael Olbrich <m.olbr...@pengutronix.de>
> Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
Acked-by: Hans Verkuil <hans.verk...@cisco.com>
Regards,
Hans
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c
> b/drivers/media/v4l2-core/videobuf2-core.c
> index 9c865da..95a798e 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -241,7 +241,8 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum
> v4l2_memory memory,
> q->bufs[q->num_buffers + buffer] = vb;
> }
>
> - __setup_offsets(q, buffer);
> + if (memory == V4L2_MEMORY_MMAP)
> + __setup_offsets(q, buffer);
>
> dprintk(1, "Allocated %d buffers, %d plane(s) each\n",
> buffer, num_planes);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
