]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: ov7740: avoid invalid framesize setting
authorAkinobu Mita <akinobu.mita@gmail.com>
Wed, 17 Apr 2019 14:06:39 +0000 (10:06 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 23 May 2019 09:39:38 +0000 (05:39 -0400)
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 <wenyou.yang@microchip.com>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/i2c/ov7740.c

index d122e350478c85a86df62917d40ee0fe8d8f22cb..5c0dfdf6756a7e13074147f582357ad522a53252 100644 (file)
@@ -785,7 +785,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;