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

Commit 10791829 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: add WARN_ONs checking if a valid struct device was passed 



The dma-contig and dma-sg memops require a valid struct device for
the DMA to be handled correctly.

Call WARN_ON and return ERR_PTR(-EINVAL) if it was NULL.

Setting the correct device pointer was forgotten in several new driver
submissions. This was caught during code review, but it really should be
caught in the code.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 0ff657b0

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

+9 −0
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ static void *vb2_dc_alloc(struct device *dev, unsigned long attrs, 
{

	struct vb2_dc_buf *buf;



	if (WARN_ON(!dev))

		return ERR_PTR(-EINVAL);



	buf = kzalloc(sizeof *buf, GFP_KERNEL);

	if (!buf)

		return ERR_PTR(-ENOMEM);
@@ -493,6 +496,9 @@ static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr, 
		return ERR_PTR(-EINVAL);

	}



	if (WARN_ON(!dev))

		return ERR_PTR(-EINVAL);



	buf = kzalloc(sizeof *buf, GFP_KERNEL);

	if (!buf)

		return ERR_PTR(-ENOMEM);
@@ -673,6 +679,9 @@ static void *vb2_dc_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, 
	if (dbuf->size < size)

		return ERR_PTR(-EFAULT);



	if (WARN_ON(!dev))

		return ERR_PTR(-EINVAL);



	buf = kzalloc(sizeof(*buf), GFP_KERNEL);

	if (!buf)

		return ERR_PTR(-ENOMEM);

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

+6 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr, 
	struct sg_table *sgt;

	struct frame_vector *vec;



	if (WARN_ON(!dev))

		return ERR_PTR(-EINVAL);



	buf = kzalloc(sizeof *buf, GFP_KERNEL);

	if (!buf)

		return ERR_PTR(-ENOMEM);
@@ -607,6 +610,9 @@ static void *vb2_dma_sg_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, 
	struct vb2_dma_sg_buf *buf;

	struct dma_buf_attachment *dba;



	if (WARN_ON(!dev))

		return ERR_PTR(-EINVAL);



	if (dbuf->size < size)

		return ERR_PTR(-EFAULT);