From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 158D8C76186 for ; Wed, 24 Jul 2019 20:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB6AC2184B for ; Wed, 24 Jul 2019 20:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998509; bh=/PxWPvXyvvy70tcEUvRgNjp9YgGWC22G+SGFrQeMoE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mDKV0dUqvAfAQBid/+iEvCM0Lo5Pge8cCFTBFhQBjGvGxaziodwk7waqZy1Xn8CWn H3x0A538PcDn2kMyGLO9d2NatfhvWmGyq2snYtZhKGxkSdE1pbpTRgc44JgkjrEZIN HNO4Ykxi8rvbGKCvmS+NAUf2kVJjg/ms2M4M409Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392333AbfGXUBs (ORCPT ); Wed, 24 Jul 2019 16:01:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:50918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392322AbfGXUBq (ORCPT ); Wed, 24 Jul 2019 16:01:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 85B2E206BA; Wed, 24 Jul 2019 20:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998506; bh=/PxWPvXyvvy70tcEUvRgNjp9YgGWC22G+SGFrQeMoE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnOzvwlOp2DMdeE2xMtSUyVaQpgp5P23N1saqxbQepk8GYvct/saOk1MXO+N5NHhG K/pybHl+Y3eoLiPcGe0ODRahS0AHlAwgSn/BhJiwBXV+Qpu73yAItiMQH+EocU1Xt2 ZYukY4M+eOiBMYjthYVtFpdH3L4GmQNaxH0bFS+s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenyou Yang , Eugen Hristev , Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 018/271] media: ov7740: avoid invalid framesize setting Date: Wed, 24 Jul 2019 21:18:07 +0200 Message-Id: <20190724191656.808396677@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 6e4ab830ac6d6a0d7cd7f87dc5d6536369bf24a8 ] If the requested framesize by VIDIOC_SUBDEV_S_FMT is larger than supported framesizes, it causes an out of bounds array access and the resulting framesize is unexpected. Avoid out of bounds array access and select the default framesize. Cc: Wenyou Yang Cc: Eugen Hristev Signed-off-by: Akinobu Mita Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov7740.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index f5a1ee90a6c5..8a6a7a5929aa 100644 --- a/drivers/media/i2c/ov7740.c +++ b/drivers/media/i2c/ov7740.c @@ -761,7 +761,11 @@ static int ov7740_try_fmt_internal(struct v4l2_subdev *sd, fsize++; } - + if (i >= ARRAY_SIZE(ov7740_framesizes)) { + fsize = &ov7740_framesizes[0]; + fmt->width = fsize->width; + fmt->height = fsize->height; + } if (ret_frmsize != NULL) *ret_frmsize = fsize; -- 2.20.1