Message ID | Pine.LNX.4.64.0909111821010.10552@pc-004.diku.dk (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Fri, 11 Sep 2009 16:22:31 +0000 Received: from bombadil.infradead.org [18.85.46.34] by caramujo.chehab.org with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Fri, 11 Sep 2009 14:03:36 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Mm8tK-0007hQ-9C; Fri, 11 Sep 2009 16:22:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754695AbZIKQVU (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Fri, 11 Sep 2009 12:21:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754697AbZIKQVT (ORCPT <rfc822;linux-media-outgoing>); Fri, 11 Sep 2009 12:21:19 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:42670 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754694AbZIKQVR (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 11 Sep 2009 12:21:17 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id 7B30D19BB94; Fri, 11 Sep 2009 18:21:20 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24981-04; Fri, 11 Sep 2009 18:21:18 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 3E50119BB8B; Fri, 11 Sep 2009 18:21:18 +0200 (CEST) Received: from pc-004.diku.dk (pc-004.diku.dk [130.225.97.4]) by nhugin.diku.dk (Postfix) with ESMTP id 70B156DF893; Fri, 11 Sep 2009 18:19:31 +0200 (CEST) Received: by pc-004.diku.dk (Postfix, from userid 3767) id 28D35383C5; Fri, 11 Sep 2009 18:21:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by pc-004.diku.dk (Postfix) with ESMTP id 268683830C; Fri, 11 Sep 2009 18:21:18 +0200 (CEST) Date: Fri, 11 Sep 2009 18:21:18 +0200 (CEST) From: Julia Lawall <julia@diku.dk> To: Mauro Carvalho Chehab <mchehab@infradead.org>, Laurent Pinchart <laurent.pinchart@skynet.be>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 2/8] drivers/media/video/uvc: introduce missing kfree Message-ID: <Pine.LNX.4.64.0909111821010.10552@pc-004.diku.dk> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: amavisd-new at diku.dk Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Julia Lawall
Sept. 11, 2009, 4:21 p.m. UTC
From: Julia Lawall <julia@diku.dk> Error handling code following kmalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> --- drivers/media/video/uvc/uvc_video.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
On Friday 11 September 2009 18:21:18 Julia Lawall wrote: > From: Julia Lawall <julia@diku.dk> > > Error handling code following kmalloc should free the allocated data. > > The semantic match that finds the problem is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // <smpl> > @r exists@ > local idexpression x; > statement S; > expression E; > identifier f,f1,l; > position p1,p2; > expression *ptr != NULL; > @@ > > x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); > ... > if (x == NULL) S > <... when != x > when != if (...) { <+...x...+> } > ( > x->f1 = E > > (x->f1 == NULL || ...) > > f(...,x->f1,...) > ) > ...> > ( > return \(0\|<+...x...+>\|ptr\); > > return@p2 ...; > ) > > @script:python@ > p1 << r.p1; > p2 << r.p2; > @@ > > print "* file: %s kmalloc %s return %s" % > (p1[0].file,p1[0].line,p2[0].line) // </smpl> > > Signed-off-by: Julia Lawall <julia@diku.dk> > --- > drivers/media/video/uvc/uvc_video.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/video/uvc/uvc_video.c > b/drivers/media/video/uvc/uvc_video.c index 5b757f3..ce2c484 100644 > --- a/drivers/media/video/uvc/uvc_video.c > +++ b/drivers/media/video/uvc/uvc_video.c > @@ -128,8 +128,11 @@ static int uvc_get_video_ctrl(struct uvc_streaming > *stream, if (data == NULL) > return -ENOMEM; > > - if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) > - return -EIO; > + if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && > + query == UVC_GET_DEF) { > + ret = -EIO; > + goto out; > + } This check can be moved before kmalloc(), removing the need to free memory in case of error. Julia, do you want to submit a modified patch or should I do it myself ? > ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum, > probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, >
> > - if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) > > - return -EIO; > > + if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && > > + query == UVC_GET_DEF) { > > + ret = -EIO; > > + goto out; > > + } > > This check can be moved before kmalloc(), removing the need to free memory in > case of error. > > Julia, do you want to submit a modified patch or should I do it myself ? I can do it. I will send a revised patch shortly. julia -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 5b757f3..ce2c484 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c @@ -128,8 +128,11 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream, if (data == NULL) return -ENOMEM; - if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) - return -EIO; + if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && + query == UVC_GET_DEF) { + ret = -EIO; + goto out; + } ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum, probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data,