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:
> [<c01bf970>] create_object+0x100/0x240
> [<c01bfadb>] kmemleak_alloc+0x2b/0x60
> [<c01bcd4b>] __kmalloc+0x14b/0x270
> [<c02fd027>] write_pool_threads+0x87/0x1d0
> [<c02fcc08>] nfsctl_transaction_write+0x58/0x70
> [<c02fcc6f>] nfsctl_transaction_read+0x4f/0x60
> [<c01c2574>] vfs_read+0x94/0x150
> [<c01c297d>] sys_read+0x3d/0x70
> [<c0102d6b>] sysenter_do_call+0x12/0x32
> [<ffffffff>] 0xffffffff
>
> write_pool_threads() only frees nthreads on error paths, in the success case
> we leak it.
Thanks! Applied.
> Signed-off-by: Eric Sesterhenn <eric.sesterhenn@xxxxxxxxxxxx>
>
> --- 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 <bfields@xxxxxxxxxxxxxx>
Date: Tue Jul 28 11:37:25 2009 -0400
nfsd: minor write_pool_threads exit cleanup
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
