kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB: video_ioctl2: handle the v4l1 compat bit first and move VIDIOCGMBUF into the switch

Browse source 
Try to make a more sensible sequence of events in __video_do_ioctl: first
check for a valid ops pointer, then get the compat part done. The VIDIOCGMBUF
command is now part of the big switch.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2010-04-06 15:56:08 -03:00 committed by Mauro Carvalho Chehab
parent dd1ad942ac
commit 6a717883e7
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/media/video/v4l2-ioctl.c
View file

@ -610,17 +610,33 @@ static long __video_do_ioctl(struct file *file,
void *fh = file->private_data; void *fh = file->private_data;
long ret = -EINVAL; long ret = -EINVAL;
if (ops == NULL) {
printk(KERN_WARNING "videodev: \"%s\" has no ioctl_ops.\n",
vfd->name);
return -EINVAL;
}
#ifdef CONFIG_VIDEO_V4L1_COMPAT
/********************************************************
All other V4L1 calls are handled by v4l1_compat module.
Those calls will be translated into V4L2 calls, and
__video_do_ioctl will be called again, with one or more
V4L2 ioctls.
********************************************************/
if (_IOC_TYPE(cmd) == 'v' && cmd != VIDIOCGMBUF &&
_IOC_NR(cmd) < BASE_VIDIOCPRIVATE) {
return v4l_compat_translate_ioctl(file, cmd, arg,
__video_do_ioctl);
}
#endif
if ((vfd->debug & V4L2_DEBUG_IOCTL) && if ((vfd->debug & V4L2_DEBUG_IOCTL) &&
!(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
v4l_print_ioctl(vfd->name, cmd); v4l_print_ioctl(vfd->name, cmd);
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
} }
if (ops == NULL) { switch (cmd) {
printk(KERN_WARNING "videodev: \"%s\" has no ioctl_ops.\n",
vfd->name);
return -EINVAL;
}
#ifdef CONFIG_VIDEO_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
/*********************************************************** /***********************************************************
@ -630,31 +646,21 @@ static long __video_do_ioctl(struct file *file,
***********************************************************/ ***********************************************************/
/* --- streaming capture ------------------------------------- */ /* --- streaming capture ------------------------------------- */
if (cmd == VIDIOCGMBUF) { case VIDIOCGMBUF:
{
struct video_mbuf *p = arg; struct video_mbuf *p = arg;
if (!ops->vidiocgmbuf) if (!ops->vidiocgmbuf)
return ret; break;
ret = ops->vidiocgmbuf(file, fh, p); ret = ops->vidiocgmbuf(file, fh, p);
if (!ret) if (!ret)
dbgarg(cmd, "size=%d, frames=%d, offsets=0x%08lx\n", dbgarg(cmd, "size=%d, frames=%d, offsets=0x%08lx\n",
p->size, p->frames, p->size, p->frames,
(unsigned long)p->offsets); (unsigned long)p->offsets);
return ret; break;
} }
/********************************************************
All other V4L1 calls are handled by v4l1_compat module.
Those calls will be translated into V4L2 calls, and
__video_do_ioctl will be called again, with one or more
V4L2 ioctls.
********************************************************/
if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE)
return v4l_compat_translate_ioctl(file, cmd, arg,
__video_do_ioctl);
#endif #endif
switch (cmd) {
/* --- capabilities ------------------------------------------ */ /* --- capabilities ------------------------------------------ */
case VIDIOC_QUERYCAP: case VIDIOC_QUERYCAP:
{ {