Skip to content

Commit ba38acb

Browse files
Hans Verkuilmchehab
authored andcommitted
[media] vivi: fix ENUM_FRAMEINTERVALS implementation
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 <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 48d829d commit ba38acb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/media/platform/vivi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,11 @@ static int vidioc_enum_frameintervals(struct file *file, void *priv,
11211121
if (!fmt)
11221122
return -EINVAL;
11231123

1124-
/* regarding width & height - we support any */
1124+
/* check for valid width/height */
1125+
if (fival->width < 48 || fival->width > MAX_WIDTH || (fival->width & 3))
1126+
return -EINVAL;
1127+
if (fival->height < 32 || fival->height > MAX_HEIGHT)
1128+
return -EINVAL;
11251129

11261130
fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
11271131

0 commit comments

Comments
 (0)