Commit 8033120f authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

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: a49d2536 ("staging/atomisp: Add support for the Intel IPU v2")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 115b7ac2
...@@ -480,7 +480,7 @@ struct imx_device { ...@@ -480,7 +480,7 @@ struct imx_device {
struct imx_vcm *vcm_driver; struct imx_vcm *vcm_driver;
struct imx_otp *otp_driver; struct imx_otp *otp_driver;
const struct imx_resolution *curr_res_table; const struct imx_resolution *curr_res_table;
int entries_curr_table; unsigned long entries_curr_table;
const struct firmware *fw; const struct firmware *fw;
struct imx_reg_addr *reg_addr; struct imx_reg_addr *reg_addr;
const struct imx_reg *param_hold; const struct imx_reg *param_hold;
......
...@@ -266,7 +266,7 @@ struct ov8858_device { ...@@ -266,7 +266,7 @@ struct ov8858_device {
const struct ov8858_reg *regs; const struct ov8858_reg *regs;
struct ov8858_vcm *vcm_driver; struct ov8858_vcm *vcm_driver;
const struct ov8858_resolution *curr_res_table; const struct ov8858_resolution *curr_res_table;
int entries_curr_table; unsigned long entries_curr_table;
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_ctrl *run_mode; struct v4l2_ctrl *run_mode;
......
...@@ -266,7 +266,7 @@ struct ov8858_device { ...@@ -266,7 +266,7 @@ struct ov8858_device {
const struct ov8858_reg *regs; const struct ov8858_reg *regs;
struct ov8858_vcm *vcm_driver; struct ov8858_vcm *vcm_driver;
const struct ov8858_resolution *curr_res_table; const struct ov8858_resolution *curr_res_table;
int entries_curr_table; unsigned long entries_curr_table;
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_ctrl *run_mode; struct v4l2_ctrl *run_mode;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment