From patchwork Thu Aug 6 23:05:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 30897 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by bilbo.ozlabs.org (Postfix) with ESMTP id 8AC96B6F20 for ; Fri, 7 Aug 2009 09:07:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756878AbZHFXHn (ORCPT ); Thu, 6 Aug 2009 19:07:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756262AbZHFXHn (ORCPT ); Thu, 6 Aug 2009 19:07:43 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:33728 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756878AbZHFXHk (ORCPT ); Thu, 6 Aug 2009 19:07:40 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n76N5AYN016622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 6 Aug 2009 16:05:11 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n76N59jW004244; Thu, 6 Aug 2009 16:05:09 -0700 Message-Id: <200908062305.n76N59jW004244@imap1.linux-foundation.org> Subject: [patch 2/2] drivers/ata: introduce missing kfree To: jeff@garzik.org Cc: linux-ide@vger.kernel.org, akpm@linux-foundation.org, julia@diku.dk, tj@kernel.org From: akpm@linux-foundation.org Date: Thu, 06 Aug 2009 16:05:09 -0700 X-Spam-Status: No, hits=-3.511 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Julia Lawall Error handling code following a kzalloc should free the allocated data. The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @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) // Signed-off-by: Julia Lawall Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton --- drivers/ata/pata_at91.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/ata/pata_at91.c~drivers-ata-introduce-missing-kfree drivers/ata/pata_at91.c --- a/drivers/ata/pata_at91.c~drivers-ata-introduce-missing-kfree +++ a/drivers/ata/pata_at91.c @@ -261,7 +261,8 @@ static int __devinit pata_at91_probe(str if (IS_ERR(info->mck)) { dev_err(dev, "failed to get access to mck clock\n"); - return -ENODEV; + ret = -ENODEV; + goto err_clk_get; } info->cs = board->chipselect; @@ -308,6 +309,7 @@ err_alt_ioremap: err_ide_ioremap: clk_put(info->mck); +err_clk_get: kfree(info); return ret;