Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8023ed09 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] videobuf2-core: Verify planes lengths for output buffers 



For output buffers application provide to the kernel the number of bytes
they stored in each plane of the buffer. Verify that the value is
smaller than or equal to the plane length.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 04074f1f

drivers/media/v4l2-core/videobuf2-core.c

+39 −0
Original line number Original line Diff line number Diff line
@@ -333,6 +333,41 @@ static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer 
	return 0;

	return 0;

}

}





/**

 * __verify_length() - Verify that the bytesused value for each plane fits in

 * the plane length and that the data offset doesn't exceed the bytesused value.

 */

static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)

{

	unsigned int length;

	unsigned int plane;



	if (!V4L2_TYPE_IS_OUTPUT(b->type))

		return 0;



	if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {

		for (plane = 0; plane < vb->num_planes; ++plane) {

			length = (b->memory == V4L2_MEMORY_USERPTR)

			       ? b->m.planes[plane].length

			       : vb->v4l2_planes[plane].length;



			if (b->m.planes[plane].bytesused > length)

				return -EINVAL;

			if (b->m.planes[plane].data_offset >=

			    b->m.planes[plane].bytesused)

				return -EINVAL;

		}

	} else {

		length = (b->memory == V4L2_MEMORY_USERPTR)

		       ? b->length : vb->v4l2_planes[0].length;



		if (b->bytesused > length)

			return -EINVAL;

	}



	return 0;

}



/**

/**

 * __buffer_in_use() - return true if the buffer is in use and

 * __buffer_in_use() - return true if the buffer is in use and

 * the queue cannot be freed (by the means of REQBUFS(0)) call

 * the queue cannot be freed (by the means of REQBUFS(0)) call
@@ -1167,6 +1202,10 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b) 
	struct vb2_queue *q = vb->vb2_queue;

	struct vb2_queue *q = vb->vb2_queue;

	int ret;

	int ret;





	ret = __verify_length(vb, b);

	if (ret < 0)

		return ret;



	switch (q->memory) {

	switch (q->memory) {

	case V4L2_MEMORY_MMAP:

	case V4L2_MEMORY_MMAP:

		ret = __qbuf_mmap(vb, b);

		ret = __qbuf_mmap(vb, b);