Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7c5594 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ioctl: clear fields in s_parm 



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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1f5965c4

drivers/media/v4l2-core/v4l2-ioctl.c

+16 −1
Original line number Diff line number Diff line
@@ -1952,7 +1952,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,