Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 1a6c0b36dd19 ("media: v4l2-core: fix VIDIOC_DQEVENT for time64 ABI")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Arnd Bergmann and committed by
Mauro Carvalho Chehab
765ba251 e84c8932

-24
-24
drivers/media/v4l2-core/v4l2-subdev.c
··· 430 430 431 431 return v4l2_event_dequeue(vfh, arg, file->f_flags & O_NONBLOCK); 432 432 433 - case VIDIOC_DQEVENT_TIME32: { 434 - struct v4l2_event_time32 *ev32 = arg; 435 - struct v4l2_event ev = { }; 436 - 437 - if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS)) 438 - return -ENOIOCTLCMD; 439 - 440 - rval = v4l2_event_dequeue(vfh, &ev, file->f_flags & O_NONBLOCK); 441 - 442 - *ev32 = (struct v4l2_event_time32) { 443 - .type = ev.type, 444 - .pending = ev.pending, 445 - .sequence = ev.sequence, 446 - .timestamp.tv_sec = ev.timestamp.tv_sec, 447 - .timestamp.tv_nsec = ev.timestamp.tv_nsec, 448 - .id = ev.id, 449 - }; 450 - 451 - memcpy(&ev32->u, &ev.u, sizeof(ev.u)); 452 - memcpy(&ev32->reserved, &ev.reserved, sizeof(ev.reserved)); 453 - 454 - return rval; 455 - } 456 - 457 433 case VIDIOC_SUBSCRIBE_EVENT: 458 434 return v4l2_subdev_call(sd, core, subscribe_event, vfh, arg); 459 435