Commit 765ba251 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: subdev: remove VIDIOC_DQEVENT_TIME32 handling 



Converting the VIDIOC_DQEVENT_TIME32/VIDIOC_DQEVENT32/
VIDIOC_DQEVENT32_TIME32 arguments to the canonical form is done in common
code, but for some reason I ended up adding another conversion helper to
subdev_do_ioctl() as well. I must have concluded that this does not go
through the common conversion, but it has done that since the ioctl
handler was first added.

I assume this one is harmless as there should be no way to arrive here
from user space if CONFIG_COMPAT_32BIT_TIME is set, but since it is dead
code, it should just get removed.

On a 64-bit architecture, as well as a 32-bit architecture without
CONFIG_COMPAT_32BIT_TIME, handling this command is a mistake,
and the kernel should return an error.

Fixes: 1a6c0b36 ("media: v4l2-core: fix VIDIOC_DQEVENT for time64 ABI")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e84c8932

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

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


		return v4l2_event_dequeue(vfh, arg, file->f_flags & O_NONBLOCK);



	case VIDIOC_DQEVENT_TIME32: {

		struct v4l2_event_time32 *ev32 = arg;

		struct v4l2_event ev = { };



		if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS))

			return -ENOIOCTLCMD;



		rval = v4l2_event_dequeue(vfh, &ev, file->f_flags & O_NONBLOCK);



		*ev32 = (struct v4l2_event_time32) {

			.type		= ev.type,

			.pending	= ev.pending,

			.sequence	= ev.sequence,

			.timestamp.tv_sec  = ev.timestamp.tv_sec,

			.timestamp.tv_nsec = ev.timestamp.tv_nsec,

			.id		= ev.id,

		};



		memcpy(&ev32->u, &ev.u, sizeof(ev.u));

		memcpy(&ev32->reserved, &ev.reserved, sizeof(ev.reserved));



		return rval;

	}



	case VIDIOC_SUBSCRIBE_EVENT:

		return v4l2_subdev_call(sd, core, subscribe_event, vfh, arg);