Re: [PATCH] gspca: add missing .type field check in VIDIOC_G_PARM

From: NÃmeth MÃrton
Date: Thu Mar 19 2009 - 18:15:00 EST


From: MÃrton NÃmeth <nm127@xxxxxxxxxxx>

The gspca webcam driver does not check the .type field of struct v4l2_streamparm.
This field is an input parameter for the driver according to V4L2 API specification,
revision 0.24 [1]. Add the missing check.

The missing check was recognised by v4l-test 0.10 [2] together with gspca_sunplus driver
and with "Trust 610 LCD POWERC@M ZOOM" webcam. This patch was verified also with
v4l-test 0.10.

The memset() is not necessary as V4L2 framework already have done this task when
vidioc_g_parm() is called.

References:
[1] V4L2 API specification, revision 0.24
http://v4l2spec.bytesex.org/spec/r11680.htm

[2] v4l-test: Test environment for Video For Linux Two API
http://v4l-test.sourceforge.net/

Signed-off-by: MÃrton NÃmeth <nm127@xxxxxxxxxxx>
---
--- linux-2.6.29-rc8/drivers/media/video/gspca/gspca.c.orig 2009-03-14 12:29:38.000000000 +0100
+++ linux-2.6.29-rc8/drivers/media/video/gspca/gspca.c 2009-03-19 20:38:22.000000000 +0100
@@ -1320,8 +1320,9 @@ static int vidioc_g_parm(struct file *fi
{
struct gspca_dev *gspca_dev = priv;

- memset(parm, 0, sizeof *parm);
- parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ return -EINVAL;
+
parm->parm.capture.readbuffers = gspca_dev->nbufread;

if (gspca_dev->sd_desc->get_streamparm) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/