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

Commit 20058f90 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-subdev.c: add 'which' checks for enum ops 



Return an error if an invalid 'which' valid is passed in.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e1c47e73

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

+12 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
	case VIDIOC_SUBDEV_ENUM_MBUS_CODE: {

		struct v4l2_subdev_mbus_code_enum *code = arg;



		if (code->which != V4L2_SUBDEV_FORMAT_TRY &&

		    code->which != V4L2_SUBDEV_FORMAT_ACTIVE)

			return -EINVAL;



		if (code->pad >= sd->entity.num_pads)

			return -EINVAL;
@@ -331,6 +335,10 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
	case VIDIOC_SUBDEV_ENUM_FRAME_SIZE: {

		struct v4l2_subdev_frame_size_enum *fse = arg;



		if (fse->which != V4L2_SUBDEV_FORMAT_TRY &&

		    fse->which != V4L2_SUBDEV_FORMAT_ACTIVE)

			return -EINVAL;



		if (fse->pad >= sd->entity.num_pads)

			return -EINVAL;
@@ -359,6 +367,10 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
	case VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: {

		struct v4l2_subdev_frame_interval_enum *fie = arg;



		if (fie->which != V4L2_SUBDEV_FORMAT_TRY &&

		    fie->which != V4L2_SUBDEV_FORMAT_ACTIVE)

			return -EINVAL;



		if (fie->pad >= sd->entity.num_pads)

			return -EINVAL;