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

Commit 5ebb6dd3 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: Fix an off by one error in 'vb2_plane_vaddr' 



We should ensure that 'plane_no' is '< vb->num_planes' as done in
'vb2_plane_cookie' just a few lines below.

Fixes: e23ccc0a ("[media] v4l: add videobuf2 Video for Linux 2 driver framework")

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e0f2e5eb

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -868,7 +868,7 @@ EXPORT_SYMBOL_GPL(vb2_core_create_bufs); 




void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no)

void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no)

{

{

	if (plane_no > vb->num_planes || !vb->planes[plane_no].mem_priv)

	if (plane_no >= vb->num_planes || !vb->planes[plane_no].mem_priv)

		return NULL;

		return NULL;





	return call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv);

	return call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv);