[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 <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index cfe7548c4493525bc49989733a400bf097ccabc2..3890f4f42a78af6f3cf29042fcf1c00b22297023 100644 (file)
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -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;