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: a49d25364d
("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>
This commit is contained in:
Родитель
115b7ac211
Коммит
8033120f36
|
@ -480,7 +480,7 @@ struct imx_device {
|
|||
struct imx_vcm *vcm_driver;
|
||||
struct imx_otp *otp_driver;
|
||||
const struct imx_resolution *curr_res_table;
|
||||
int entries_curr_table;
|
||||
unsigned long entries_curr_table;
|
||||
const struct firmware *fw;
|
||||
struct imx_reg_addr *reg_addr;
|
||||
const struct imx_reg *param_hold;
|
||||
|
|
|
@ -266,7 +266,7 @@ struct ov8858_device {
|
|||
const struct ov8858_reg *regs;
|
||||
struct ov8858_vcm *vcm_driver;
|
||||
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 *run_mode;
|
||||
|
|
|
@ -266,7 +266,7 @@ struct ov8858_device {
|
|||
const struct ov8858_reg *regs;
|
||||
struct ov8858_vcm *vcm_driver;
|
||||
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 *run_mode;
|
||||
|
|
Загрузка…
Ссылка в новой задаче