Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759559AbZCSHlT (ORCPT ); Thu, 19 Mar 2009 03:41:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756228AbZCSHlH (ORCPT ); Thu, 19 Mar 2009 03:41:07 -0400 Received: from mail3.sea5.speakeasy.net ([69.17.117.5]:60909 "EHLO mail3.sea5.speakeasy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754396AbZCSHlH convert rfc822-to-8bit (ORCPT ); Thu, 19 Mar 2009 03:41:07 -0400 X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org; Thu, 19 Mar 2009 03:41:06 EDT Date: Thu, 19 Mar 2009 00:34:23 -0700 (PDT) From: Trent Piepho X-X-Sender: xyzzy@shell2.speakeasy.net To: =?ISO-8859-1?Q?N=E9meth_M=E1rton?= cc: David Ellingsworth , Jean-Francois Moine , linux-media@vger.kernel.org, LKML Subject: Re: [PATCH] gspca: add missing .type field check in VIDIOC_G_PARM In-Reply-To: <49C1DD0C.4050500@freemail.hu> Message-ID: References: <49C133F6.3020202@freemail.hu> <30353c3d0903181445i409604e8r33678f7ce09d0288@mail.gmail.com> <49C1DD0C.4050500@freemail.hu> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2124 Lines: 50 On Thu, 19 Mar 2009, [ISO-8859-1] N?meth M?rton wrote: > David Ellingsworth wrote: > > 2009/3/18 N?meth M?rton : > >> From: M?rton N?meth > >> > >> 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. > >> > >> 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 > >> --- > >> --- 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-18 16:51:03.000000000 +0100 > >> @@ -1320,6 +1320,9 @@ static int vidioc_g_parm(struct file *fi > >> { > >> struct gspca_dev *gspca_dev = priv; > >> > >> + if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) > >> + return -EINVAL; > >> + > >> memset(parm, 0, sizeof *parm); > >> parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; > > ^^^^^^^^^^^^^^^^^^^ > > This line should be deleted as it's no longer needed. > > Because memset() clears the whole parm structure this line is necessary. In other > drivers the following code is there: > > tmp = parm->type; > memset(parm, 0, sizeof(*parm)); > parm->type = parm; The memset isn't needed anymore either, I put it into v4l2_ioctl. I removed most of the code like that but I may have missed some drivers. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/