From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748Ab1HVE2r (ORCPT ); Mon, 22 Aug 2011 00:28:47 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:50686 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533Ab1HVE2p (ORCPT ); Mon, 22 Aug 2011 00:28:45 -0400 Date: Sun, 21 Aug 2011 21:28:39 -0700 From: Joel Becker To: Julia Lawall Cc: Mark Fasheh , kernel-janitors@vger.kernel.org, Wengang Wang , Tao Ma , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free Message-ID: <20110822042838.GE31134@noexit.corp.google.com> Mail-Followup-To: Julia Lawall , Mark Fasheh , kernel-janitors@vger.kernel.org, Wengang Wang , Tao Ma , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org References: <1310227479-14472-1-git-send-email-julia@diku.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1310227479-14472-1-git-send-email-julia@diku.dk> X-Burt-Line: Trees are cool. X-Red-Smith: Ninety feet between bases is perhaps as close as man has ever come to perfection. User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org this patch is now in the fixes branch of ocfs2.git. On Sat, Jul 09, 2011 at 06:04:39PM +0200, Julia Lawall wrote: > From: Julia Lawall > > Memory allocated using kmem_cache_zalloc should be freed using > kmem_cache_free, not kfree. > > The semantic patch that fixes this problem is as follows: > (http://coccinelle.lip6.fr/) > > // > @@ > expression x,e,e1,e2; > @@ > > x = kmem_cache_zalloc(e1,e2) > ... when != x = e > ?-kfree(x) > +kmem_cache_free(e1,x) > // > > Signed-off-by: Julia Lawall > > --- > fs/ocfs2/dlm/dlmlock.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff -u -p a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c > --- a/fs/ocfs2/dlm/dlmlock.c > +++ b/fs/ocfs2/dlm/dlmlock.c > @@ -440,7 +440,7 @@ struct dlm_lock * dlm_new_lock(int type, > /* zero memory only if kernel-allocated */ > lksb = kzalloc(sizeof(*lksb), GFP_NOFS); > if (!lksb) { > - kfree(lock); > + kmem_cache_free(dlm_lock_cache, lock); > return NULL; > } > kernel_allocated = 1; > > -- > 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/ -- Life's Little Instruction Book #43 "Never give up on somebody. Miracles happen every day." http://www.jlbec.org/ jlbec@evilplan.org