Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] vivi: fix ENUM_FRAMEINTERVALS implementation

Browse Source 
This function never checked if width and height are correct. Add such
a check so the v4l2-compliance tool returns OK again for vivi.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil 2014-02-25 07:15:54 -03:00 committed by Mauro Carvalho Chehab
parent 48d829dadb
commit ba38acb142
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/vivi.c
View File

@ -1121,7 +1121,11 @@ static int vidioc_enum_frameintervals(struct file *file, void *priv,
if (!fmt)
return -EINVAL;
/* regarding width & height - we support any */
/* check for valid width/height */
if (fival->width < 48 || fival->width > MAX_WIDTH || (fival->width & 3))
return -EINVAL;
if (fival->height < 32 || fival->height > MAX_HEIGHT)
return -EINVAL;
fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;