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

Commit 3103c7b4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-subdev: without controls return -ENOTTY 



If the subdev did not define any controls, then return -ENOTTY if
userspace attempts to call these ioctls.

The control framework functions will return -EINVAL, not -ENOTTY if
vfh->ctrl_handler is NULL.

Several of these framework functions are also called directly from
drivers, so I don't want to change the error code there.

Found with vimc and v4l2-compliance.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 1ceda32b

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

+24 −0
Original line number Diff line number Diff line
@@ -187,27 +187,51 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 


	switch (cmd) {

	case VIDIOC_QUERYCTRL:

		/*

		 * TODO: this really should be folded into v4l2_queryctrl (this

		 * currently returns -EINVAL for NULL control handlers).

		 * However, v4l2_queryctrl() is still called directly by

		 * drivers as well and until that has been addressed I believe

		 * it is safer to do the check here. The same is true for the

		 * other control ioctls below.

		 */

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_queryctrl(vfh->ctrl_handler, arg);



	case VIDIOC_QUERY_EXT_CTRL:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_query_ext_ctrl(vfh->ctrl_handler, arg);



	case VIDIOC_QUERYMENU:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_querymenu(vfh->ctrl_handler, arg);



	case VIDIOC_G_CTRL:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_g_ctrl(vfh->ctrl_handler, arg);



	case VIDIOC_S_CTRL:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_s_ctrl(vfh, vfh->ctrl_handler, arg);



	case VIDIOC_G_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg);



	case VIDIOC_S_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, arg);



	case VIDIOC_TRY_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg);



	case VIDIOC_DQEVENT: