]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
media: atomisp2: Array underflow in atomisp_enum_input()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 19 Jul 2017 09:55:47 +0000 (05:55 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 26 Jul 2017 12:24:22 +0000 (08:24 -0400)
The problem here is this code from atomisp_enum_input():

   581          int index = input->index;
   582
   583          if (index >= isp->input_cnt)
   584                  return -EINVAL;
   585
   586          if (!isp->inputs[index].camera)
   587                  return -EINVAL;

"input->index" is a u32 which comes from the ioctl.  We want negative
values of "index" to be counted as -EINVAL but they aren't.  I've fixed
this by changing the type of "isp->input_cnt" to unsigned int.

Fixes: a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h

index d3667132851bca6ce854c7c2014ce5ded1f23d6c..c8e0c4fe3717807b6a76df69ae1cfd3be566b1e6 100644 (file)
@@ -275,7 +275,7 @@ struct atomisp_device {
         */
        struct mutex streamoff_mutex;
 
-       int input_cnt;
+       unsigned int input_cnt;
        struct atomisp_input_subdev inputs[ATOM_ISP_MAX_INPUTS];
        struct v4l2_subdev *flash;
        struct v4l2_subdev *motor;