path: root/drivers/media/video/v4l2-ioctl.c
diff options
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-28 22:25:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:44 -0300
commit34796bc009565ea72643087b7d69c9fa748bce9b (patch)
tree85aa4eaaaad8f188cc574e9f8488f5fb2a5d51e3 /drivers/media/video/v4l2-ioctl.c
parent3fd8ab30c1fe9118a13f4b55172067ee04ef7a67 (diff)
V4L/DVB (11260): v4l2-ioctl: Check format for S_PARM and G_PARM
Return EINVAL if VIDIOC_S/G_PARM is called for a buffer type that the driver doesn't define a ->vidioc_try_fmt_XXX() method for. Several other ioctls, like QUERYBUF, QBUF, and DQBUF, etc. do this too. It saves each driver from having to check if the buffer type is one that it supports. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 54ba6b0b951f..f41c6f506f42 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1551,6 +1551,9 @@ static long __video_do_ioctl(struct file *file,
struct v4l2_streamparm *p = arg;
if (ops->vidioc_g_parm) {
+ ret = check_fmt(ops, p->type);
+ if (ret)
+ break;
ret = ops->vidioc_g_parm(file, fh, p);
} else {
if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1570,6 +1573,10 @@ static long __video_do_ioctl(struct file *file,
if (!ops->vidioc_s_parm)
+ ret = check_fmt(ops, p->type);
+ if (ret)
+ break;
dbgarg(cmd, "type=%d\n", p->type);
ret = ops->vidioc_s_parm(file, fh, p);

Privacy Policy