Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1632524 > unrolled thread

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

Started byChristophe JAILLET <christophe.jaillet@wanadoo.fr>
First post2017-04-28 07:00 +0200
Last post2017-04-28 10:20 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-04-28 07:00 +0200
    Re: [PATCH v2] [media] vb2: Fix an off by one error in  'vb2_plane_vaddr' Sakari Ailus <sakari.ailus@iki.fi> - 2017-04-28 10:20 +0200

#1632524 — [PATCH v2] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'

FromChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Date2017-04-28 07:00 +0200
Subject[PATCH v2] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'
Message-ID<tB6aB-2yO-3@gated-at.bofh.it>
We should ensure that 'plane_no' is '< vb->num_planes' as done in
'vb2_plane_cookie' just a few lines below.

Cc: stable@vger.kernel.org
Fixes: e23ccc0ad925 ("[media] v4l: add videobuf2 Video for Linux 2 driver framework")

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: add CC and Fixes tags
---
 drivers/media/v4l2-core/videobuf2-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 94afbbf92807..c0175ea7e7ad 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -868,7 +868,7 @@ EXPORT_SYMBOL_GPL(vb2_core_create_bufs);
 
 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 call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv);
-- 
2.11.0

[toc] | [next] | [standalone]


#1632615 — Re: [PATCH v2] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'

FromSakari Ailus <sakari.ailus@iki.fi>
Date2017-04-28 10:20 +0200
SubjectRe: [PATCH v2] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'
Message-ID<tB9ia-4Lz-15@gated-at.bofh.it>
In reply to#1632524
On Fri, Apr 28, 2017 at 06:51:40AM +0200, Christophe JAILLET wrote:
> We should ensure that 'plane_no' is '< vb->num_planes' as done in
> 'vb2_plane_cookie' just a few lines below.
> 
> Cc: stable@vger.kernel.org
> Fixes: e23ccc0ad925 ("[media] v4l: add videobuf2 Video for Linux 2 driver framework")
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> v2: add CC and Fixes tags
> ---
>  drivers/media/v4l2-core/videobuf2-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
> index 94afbbf92807..c0175ea7e7ad 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -868,7 +868,7 @@ EXPORT_SYMBOL_GPL(vb2_core_create_bufs);
>  
>  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 call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv);

Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>

-- 
Sakari Ailus
e-mail: sakari.ailus@iki.fi	XMPP: sailus@retiisi.org.uk

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web