diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-04-28 01:51:40 -0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-25 22:02:21 -0400 |
| commit | 61df07cce8eba07e3b40c09d16a51e2204f7536f (patch) | |
| tree | 195ca51562ca90f0ef9829323fe2995837acd0d2 /drivers/media | |
| parent | 6ea9210c046f2a3505e2b6691dfdddb22ed0c008 (diff) | |
[media] vb2: Fix an off by one error in 'vb2_plane_vaddr'
[ Upstream commit 5ebb6dd36c9f5fb37b1077b393c254d70a14cb46 ]
We should ensure that 'plane_no' is '< vb->num_planes' as done in
'vb2_plane_cookie' just a few lines below.
Fixes: e23ccc0ad925 ("[media] v4l: add videobuf2 Video for Linux 2 driver framework")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/videobuf2-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 472eaad6fb78..fd9b252e2b34 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1122,7 +1122,7 @@ EXPORT_SYMBOL_GPL(vb2_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); |