vb2: fix plane index sanity check in vb2_plane_cookie()
authorZhaowei Yuan <zhaowei.yuan@samsung.com>
Fri, 22 Aug 2014 02:28:21 +0000 (23:28 -0300)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 15 Sep 2017 17:30:50 +0000 (18:30 +0100)
commit a9ae4692eda4b99f85757b15d60971ff78a0a0e2 upstream.

It's also invalid when plane_no is equal to vb->num_planes

Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/media/video/videobuf2-core.c

index 95a3f5e..912a74f 100644 (file)
@@ -754,7 +754,7 @@ void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no)
 {
        struct vb2_queue *q = vb->vb2_queue;
 
-       if (plane_no > vb->num_planes)
+       if (plane_no >= vb->num_planes)
                return NULL;
 
        return call_memop(q, plane_no, cookie, vb->planes[plane_no].mem_priv);