]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
media: atomisp2: array underflow in imx_enum_frame_size()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 19 Jul 2017 09:58:20 +0000 (05:58 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 26 Jul 2017 12:26:21 +0000 (08:26 -0400)
commit8033120f36c0b7212825f621a54e2d0f5ce72f72
tree04f8e515f1fd16bc7dfc88a700a7b6e601840bb0
parent115b7ac211d11c5995296dc612c4c8fab349d4b9
media: atomisp2: array underflow in imx_enum_frame_size()

The code looks in imx_enum_frame_size() looks like this:

  2066          int index = fse->index;
  2067          struct imx_device *dev = to_imx_sensor(sd);
  2068
  2069          mutex_lock(&dev->input_lock);
  2070          if (index >= dev->entries_curr_table) {
  2071                  mutex_unlock(&dev->input_lock);
  2072                  return -EINVAL;
  2073          }
  2074
  2075          fse->min_width = dev->curr_res_table[index].width;

"fse->index" is a u32 that comes from the user.  We want negative values
of "index" to be -EINVAL so we don't read before the start of the
dev->curr_res_table[] array.  I've made "entries_curr_table" unsigned
long to fix this.  I thought about making it unsigned int, but because
of struct alignment, it doesn't use more memory either way.

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/i2c/imx/imx.h
drivers/staging/media/atomisp/i2c/ov8858.h
drivers/staging/media/atomisp/i2c/ov8858_btns.h