diff options
| author | Kees Cook <keescook@chromium.org> | 2023-02-04 19:36:17 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-03-19 22:50:49 +0100 |
| commit | d5872e93fab99e371de97537d7f352cecdf7f92e (patch) | |
| tree | 6e816fe67e985d7e2509188bc3726bb2544138f0 /drivers/media/tuners | |
| parent | de163422206076d764e800486f9c28a0ede7410a (diff) | |
| download | linux-d5872e93fab99e371de97537d7f352cecdf7f92e.tar.gz linux-d5872e93fab99e371de97537d7f352cecdf7f92e.tar.bz2 linux-d5872e93fab99e371de97537d7f352cecdf7f92e.zip | |
media: mxl5005s: Bounds check size used for max array index
The use of state->CH_Ctrl[i].size in a shift operation implies that its
value can be as much as 32, but the state->CH_Ctrl[i].val array is only
25 in size. Bounds check the size before shifting and looping. Fixes
warnings seen with GCC 13:
../drivers/media/tuners/mxl5005s.c: In function 'MXL_ControlWrite_Group.isra':
../drivers/media/tuners/mxl5005s.c:3450:70: warning: array subscript 32 is above array bounds of 'u16[25]' {aka 'short unsigned int[25]'} [-Warray-bounds=]
3450 | state->CH_Ctrl[i].val[j] = (u8)((value >> j) & 0x01);
| ~~~~~~~~~~~~~~~~~~~~~^~~
../drivers/media/tuners/mxl5005s.c:238:13: note: while referencing 'val'
238 | u16 val[25]; /* Binary representation of Value */
| ^~~
Cc: Colin Ian King <colin.i.king@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/tuners')
| -rw-r--r-- | drivers/media/tuners/mxl5005s.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c index 3a509038c8df..06dfab9fb8cb 100644 --- a/drivers/media/tuners/mxl5005s.c +++ b/drivers/media/tuners/mxl5005s.c @@ -3423,9 +3423,11 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum, if (controlNum == state->Init_Ctrl[i].Ctrl_Num) { - highLimit = 1 << state->Init_Ctrl[i].size; + u16 size = min_t(u16, state->Init_Ctrl[i].size, + ARRAY_SIZE(state->Init_Ctrl[i].val)); + highLimit = 1 << size; if (value < highLimit) { - for (j = 0; j < state->Init_Ctrl[i].size; j++) { + for (j = 0; j < size; j++) { state->Init_Ctrl[i].val[j] = (u8)((value >> j) & 0x01); MXL_RegWriteBit(fe, (u8)(state->Init_Ctrl[i].addr[j]), (u8)(state->Init_Ctrl[i].bit[j]), @@ -3442,9 +3444,11 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum, if (controlNum == state->CH_Ctrl[i].Ctrl_Num) { - highLimit = 1 << state->CH_Ctrl[i].size; + u16 size = min_t(u16, state->CH_Ctrl[i].size, + ARRAY_SIZE(state->CH_Ctrl[i].val)); + highLimit = 1 << size; if (value < highLimit) { - for (j = 0; j < state->CH_Ctrl[i].size; j++) { + for (j = 0; j < size; j++) { state->CH_Ctrl[i].val[j] = (u8)((value >> j) & 0x01); MXL_RegWriteBit(fe, (u8)(state->CH_Ctrl[i].addr[j]), (u8)(state->CH_Ctrl[i].bit[j]), |