mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
media: pvrusb2: Prevent a buffer overflow
[ Upstream commitc1ced46c7b
] The ctrl_check_input() function is called from pvr2_ctrl_range_check(). It's supposed to validate user supplied input and return true or false depending on whether the input is valid or not. The problem is that negative shifts or shifts greater than 31 are undefined in C. In practice with GCC they result in shift wrapping so this function returns true for some inputs which are not valid and this could result in a buffer overflow: drivers/media/usb/pvrusb2/pvrusb2-ctrl.c:205 pvr2_ctrl_get_valname() warn: uncapped user index 'names[val]' The cptr->hdw->input_allowed_mask mask is configured in pvr2_hdw_create() and the highest valid bit is BIT(4). Fixes:7fb20fa38c
("V4L/DVB (7299): pvrusb2: Improve logic which handles input choice availability") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
66185458e2
commit
9449e18774
2 changed files with 3 additions and 0 deletions
|
@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)
|
|||
|
||||
static int ctrl_check_input(struct pvr2_ctrl *cptr,int v)
|
||||
{
|
||||
if (v < 0 || v > PVR2_CVAL_INPUT_MAX)
|
||||
return 0;
|
||||
return ((1 << v) & cptr->hdw->input_allowed_mask) != 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -50,6 +50,7 @@
|
|||
#define PVR2_CVAL_INPUT_COMPOSITE 2
|
||||
#define PVR2_CVAL_INPUT_SVIDEO 3
|
||||
#define PVR2_CVAL_INPUT_RADIO 4
|
||||
#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIO
|
||||
|
||||
enum pvr2_config {
|
||||
pvr2_config_empty, /* No configuration */
|
||||
|
|
Loading…
Reference in a new issue