Commit f0b7c7fc authored Nov 16, 2011 by Marek Szyprowski Committed by Mauro Carvalho Chehab Dec 30, 2011

[media] media: vb2: fix queueing of userptr buffers with null buffer pointer



Heuristic that checks if the memory pointer has been changed lacked a check
if the pointer was actually provided by the userspace, what allowed one to
queue a NULL pointer which was accepted without further checking. This
patch fixes this issue.

Reported-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 54828d19

drivers/media/video/videobuf2-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,8 @@ static int __qbuf_userptr(struct vb2_buffer vb, const struct v4l2_buffer b)

		for (plane = 0; plane < vb->num_planes; ++plane) {
		/* Skip the plane if already verified */
		if (vb->v4l2_planes[plane].m.userptr == planes[plane].m.userptr
		if (vb->v4l2_planes[plane].m.userptr &&
		vb->v4l2_planes[plane].m.userptr == planes[plane].m.userptr
		&& vb->v4l2_planes[plane].length == planes[plane].length)
		continue;