From patchwork Fri Aug 22 02:28:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaowei Yuan X-Patchwork-Id: 4760451 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B0CA9F2E9 for ; Fri, 22 Aug 2014 02:32:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FABB201BB for ; Fri, 22 Aug 2014 02:32:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1BF32018E for ; Fri, 22 Aug 2014 02:32:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755560AbaHVCcN (ORCPT ); Thu, 21 Aug 2014 22:32:13 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:17220 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755497AbaHVCcM (ORCPT ); Thu, 21 Aug 2014 22:32:12 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NAO00HDFSDKRL40@mailout3.samsung.com>; Fri, 22 Aug 2014 11:32:08 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-4f-53f6aba8fc68 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 95.E9.04943.8ABA6F35; Fri, 22 Aug 2014 11:32:08 +0900 (KST) Received: from localhost ([109.123.123.72]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NAO00F9OSD3SEG0@mmp2.samsung.com>; Fri, 22 Aug 2014 11:32:08 +0900 (KST) From: Zhaowei Yuan To: linux-media@vger.kernel.org, k.debski@samsung.com, m.chehab@samsung.com, kyungmin.park@samsung.com, jtp.park@samsung.com Cc: linux-samsung-soc@vger.kernel.org, hverkuil@xs4all.nl Subject: [PATCH V2] vb2: fix plane index sanity check in vb2_plane_cookie() Date: Fri, 22 Aug 2014 10:28:21 +0800 Message-id: <1408674501-25336-1-git-send-email-zhaowei.yuan@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHJMWRmVeSWpSXmKPExsVy+t9jQd0Vq78FG+x8zGdxavIzJosja68y Wfx4fYHN4mzTG3aLng1bWS1mnN/HZHFxnbwDu0ffllWMHp83yXmc+vqZPYA5issmJTUnsyy1 SN8ugSujZ+cXpoK9bBXT5h1la2A8y9rFyMkhIWAicWvhHCYIW0ziwr31bCC2kMB0RolL/xwh 7N+MEkc/8YDYbAK6EivvbAbrFRGok9gw9x0ziM0sYCkx+8V+sF5hAW+JBT+2gc1kEVCVWHm5 CczmFfCQWPvkLWMXIwfQLgWJOZNsJjByL2BkWMUomlqQXFCclJ5rqFecmFtcmpeul5yfu4kR HArPpHYwrmywOMQowMGoxMMb8eVrsBBrYllxZe4hRgkOZiUR3k3zvgUL8aYkVlalFuXHF5Xm pBYfYpTmYFES5z3Qah0oJJCeWJKanZpakFoEk2Xi4JRqYOyLdhNa9itReKlS+yap4xM1Zm0v +ORxZ9Xu1FPnXwkekTGpuaNwoZ6l7ceyD8phHZNn6Wj2P7jCmXb90qFrjJEG1267HOWW4edv ik2LuRG4r+j11qe7N/0sObtF2XKJ0LKaxHXbJOObWhfxneg956Uqu23vtjsmDcWVxdXBbybX 8Dgv2bRjxnMlluKMREMt5qLiRABnTIDUAQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's also invalid that plane_no equals to vb->num_planes Signed-off-by: Zhaowei Yuan --- drivers/media/v4l2-core/videobuf2-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index c359006..1ae4e57 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1130,7 +1130,7 @@ EXPORT_SYMBOL_GPL(vb2_plane_vaddr); */ void *vb2_plane_cookie(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, cookie, vb->planes[plane_no].mem_priv);