Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41469 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751864AbdIIWYn (ORCPT ); Sat, 9 Sep 2017 18:24:43 -0400 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Christophe JAILLET" , "Mauro Carvalho Chehab" , "Sakari Ailus" , "Hans Verkuil" Date: Sat, 09 Sep 2017 22:47:39 +0100 Message-ID: Subject: [PATCH 3.2 064/106] [media] vb2: Fix an off by one error in 'vb2_plane_vaddr' In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: 3.2.93-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET commit 5ebb6dd36c9f5fb37b1077b393c254d70a14cb46 upstream. 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") Signed-off-by: Christophe JAILLET Reviewed-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab [bwh: Backported to 3.2: adjust filename, context] Signed-off-by: Ben Hutchings --- drivers/media/video/videobuf2-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -731,7 +731,7 @@ void *vb2_plane_vaddr(struct vb2_buffer { 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, vaddr, vb->planes[plane_no].mem_priv);