From: "J. Bruce Fields" Subject: Re: [Patch] Fix memory leak in write_pool_threads Date: Tue, 28 Jul 2009 11:40:21 -0400 Message-ID: <20090728154021.GE19497@fieldses.org> References: <1248784328.3250.30.camel@queen> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: catalin.marinas@gmail.com, linux-nfs@vger.kernel.org To: Eric Sesterhenn Return-path: Received: from fieldses.org ([174.143.236.118]:51618 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754500AbZG1PkW (ORCPT ); Tue, 28 Jul 2009 11:40:22 -0400 In-Reply-To: <1248784328.3250.30.camel@queen> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Jul 28, 2009 at 02:32:08PM +0200, Eric Sesterhenn wrote: > hi, > > kmemcheck produces the following warning > > unreferenced object 0xc9ec02a0 (size 8): > comm "cat", pid 19048, jiffies 730243 > backtrace: > [] create_object+0x100/0x240 > [] kmemleak_alloc+0x2b/0x60 > [] __kmalloc+0x14b/0x270 > [] write_pool_threads+0x87/0x1d0 > [] nfsctl_transaction_write+0x58/0x70 > [] nfsctl_transaction_read+0x4f/0x60 > [] vfs_read+0x94/0x150 > [] sys_read+0x3d/0x70 > [] sysenter_do_call+0x12/0x32 > [] 0xffffffff > > write_pool_threads() only frees nthreads on error paths, in the success case > we leak it. Thanks! Applied. > Signed-off-by: Eric Sesterhenn > > --- linux/fs/nfsd/nfsctl.c.orig 2009-07-28 14:19:19.000000000 +0200 > +++ linux/fs/nfsd/nfsctl.c 2009-07-28 14:19:30.000000000 +0200 > @@ -784,6 +784,7 @@ static ssize_t write_pool_threads(struct > mesg += len; > } > > + kfree(nthreads); > mutex_unlock(&nfsd_mutex); > return (mesg-buf); It also seems a little silly not to share the exit code here; applying the following on top. --b. commit 766dc4031548759efe4bd619715d3b5ffc2b53a5 Author: J. Bruce Fields Date: Tue Jul 28 11:37:25 2009 -0400 nfsd: minor write_pool_threads exit cleanup Signed-off-by: J. Bruce Fields diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 48da164..b51e7ae 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -784,11 +784,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size) size -= len; mesg += len; } - - kfree(nthreads); - mutex_unlock(&nfsd_mutex); - return (mesg-buf); - + rv = mesg - buf; out_free: kfree(nthreads); mutex_unlock(&nfsd_mutex);