media: v4l2-ioctl: clear fields in s_parm

commit 8a7c5594c02022ca5fa7fb603e11b3e1feb76ed5 upstream.

Zero the reserved capture/output array.

Zero the extendedmode (it is never used in drivers).

Clear all flags in capture/outputmode except for V4L2_MODE_HIGHQUALITY,
as that is the only valid flag.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index f1ef4e97238e9c094ce2cf62ebef88511569bfc4..681eef972e63bdd1856fba71b33a4d6f726ea0fb 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1945,7 +1945,22 @@ static int v4l_s_parm(const struct v4l2_ioctl_ops *ops,
        struct v4l2_streamparm *p = arg;
        int ret = check_fmt(file, p->type);
 
-       return ret ? ret : ops->vidioc_s_parm(file, fh, p);
+       if (ret)
+               return ret;
+
+       /* Note: extendedmode is never used in drivers */
+       if (V4L2_TYPE_IS_OUTPUT(p->type)) {
+               memset(p->parm.output.reserved, 0,
+                      sizeof(p->parm.output.reserved));
+               p->parm.output.extendedmode = 0;
+               p->parm.output.outputmode &= V4L2_MODE_HIGHQUALITY;
+       } else {
+               memset(p->parm.capture.reserved, 0,
+                      sizeof(p->parm.capture.reserved));
+               p->parm.capture.extendedmode = 0;
+               p->parm.capture.capturemode &= V4L2_MODE_HIGHQUALITY;
+       }
+       return ops->vidioc_s_parm(file, fh, p);
 }
 
 static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops,