media: v4l2-subdev: clear reserved fields

Clear the reserved fields for these ioctls according to the specification:

VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL
VIDIOC_SUBDEV_ENUM_FRAME_SIZE
VIDIOC_SUBDEV_ENUM_MBUS_CODE
VIDIOC_SUBDEV_G_CROP, VIDIOC_SUBDEV_S_CROP
VIDIOC_SUBDEV_G_FMT, VIDIOC_SUBDEV_S_FMT
VIDIOC_SUBDEV_G_FRAME_INTERVAL, VIDIOC_SUBDEV_S_FRAME_INTERVAL
VIDIOC_SUBDEV_G_SELECTION, VIDIOC_SUBDEV_S_SELECTION

Found with v4l2-compliance.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index c5639817db34902a3c7ada8552d63abbd9ea492f..74fe8083cf26681bd640cba6bcf11b5f400f45ed 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -260,6 +260,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (rval)
                        return rval;
 
+               memset(format->reserved, 0, sizeof(format->reserved));
+               memset(format->format.reserved, 0, sizeof(format->format.reserved));
                return v4l2_subdev_call(sd, pad, get_fmt, subdev_fh->pad, format);
        }
 
@@ -270,6 +272,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (rval)
                        return rval;
 
+               memset(format->reserved, 0, sizeof(format->reserved));
+               memset(format->format.reserved, 0, sizeof(format->format.reserved));
                return v4l2_subdev_call(sd, pad, set_fmt, subdev_fh->pad, format);
        }
 
@@ -281,6 +285,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (rval)
                        return rval;
 
+               memset(crop->reserved, 0, sizeof(crop->reserved));
                memset(&sel, 0, sizeof(sel));
                sel.which = crop->which;
                sel.pad = crop->pad;
@@ -298,6 +303,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                struct v4l2_subdev_crop *crop = arg;
                struct v4l2_subdev_selection sel;
 
+               memset(crop->reserved, 0, sizeof(crop->reserved));
                rval = check_crop(sd, crop);
                if (rval)
                        return rval;
@@ -326,6 +332,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (code->pad >= sd->entity.num_pads)
                        return -EINVAL;
 
+               memset(code->reserved, 0, sizeof(code->reserved));
                return v4l2_subdev_call(sd, pad, enum_mbus_code, subdev_fh->pad,
                                        code);
        }
@@ -340,6 +347,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (fse->pad >= sd->entity.num_pads)
                        return -EINVAL;
 
+               memset(fse->reserved, 0, sizeof(fse->reserved));
                return v4l2_subdev_call(sd, pad, enum_frame_size, subdev_fh->pad,
                                        fse);
        }
@@ -350,6 +358,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (fi->pad >= sd->entity.num_pads)
                        return -EINVAL;
 
+               memset(fi->reserved, 0, sizeof(fi->reserved));
                return v4l2_subdev_call(sd, video, g_frame_interval, arg);
        }
 
@@ -359,6 +368,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (fi->pad >= sd->entity.num_pads)
                        return -EINVAL;
 
+               memset(fi->reserved, 0, sizeof(fi->reserved));
                return v4l2_subdev_call(sd, video, s_frame_interval, arg);
        }
 
@@ -372,6 +382,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (fie->pad >= sd->entity.num_pads)
                        return -EINVAL;
 
+               memset(fie->reserved, 0, sizeof(fie->reserved));
                return v4l2_subdev_call(sd, pad, enum_frame_interval, subdev_fh->pad,
                                        fie);
        }
@@ -383,6 +394,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (rval)
                        return rval;
 
+               memset(sel->reserved, 0, sizeof(sel->reserved));
                return v4l2_subdev_call(
                        sd, pad, get_selection, subdev_fh->pad, sel);
        }
@@ -394,6 +406,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                if (rval)
                        return rval;
 
+               memset(sel->reserved, 0, sizeof(sel->reserved));
                return v4l2_subdev_call(
                        sd, pad, set_selection, subdev_fh->pad, sel);
        }