diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-07-19 05:56:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-07-26 08:25:25 -0400 |
commit | 115b7ac211d11c5995296dc612c4c8fab349d4b9 (patch) | |
tree | b59c4e6070002cea07ff3deb6a6a94546903e79d | |
parent | 7b065c554ca55fbc96eced98c7cec0f442ab018a (diff) |
media: atomisp2: array underflow in ap1302_enum_frame_size()
The problem is this code from ap1302_enum_frame_size():
738 int index = fse->index;
739
740 mutex_lock(&dev->input_lock);
741 context = ap1302_get_context(sd);
742 if (index >= dev->cntx_res[context].res_num) {
743 mutex_unlock(&dev->input_lock);
744 return -EINVAL;
745 }
746
747 res_table = dev->cntx_res[context].res_table;
748 fse->min_width = res_table[index].width;
"fse->index" is a u32 that come from the user. We want negative values
of "index" to be treated as -EINVAL but they're not so we can read from
before the start of the res_table[] array.
I've fixed this by making "res_num" a u32. I made "cur_res" a u32 as
well, just for consistency.
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>
-rw-r--r-- | drivers/staging/media/atomisp/i2c/ap1302.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/i2c/ap1302.h b/drivers/staging/media/atomisp/i2c/ap1302.h index 9341232c580d..4d0b181a9671 100644 --- a/drivers/staging/media/atomisp/i2c/ap1302.h +++ b/drivers/staging/media/atomisp/i2c/ap1302.h | |||
@@ -158,8 +158,8 @@ struct ap1302_res_struct { | |||
158 | }; | 158 | }; |
159 | 159 | ||
160 | struct ap1302_context_res { | 160 | struct ap1302_context_res { |
161 | s32 res_num; | 161 | u32 res_num; |
162 | s32 cur_res; | 162 | u32 cur_res; |
163 | struct ap1302_res_struct *res_table; | 163 | struct ap1302_res_struct *res_table; |
164 | }; | 164 | }; |
165 | 165 | ||