* [PATCH] btrfs: fix memory leak in btrfs_defrag_file
@ 2011-09-01 14:33 Diego Calleja
2011-09-02 1:46 ` Li Zefan
2011-09-22 10:36 ` David Sterba
0 siblings, 2 replies; 3+ messages in thread
From: Diego Calleja @ 2011-09-01 14:33 UTC (permalink / raw)
To: Chris Mason; +Cc: linux-btrfs
kmemleak found this:
unreferenced object 0xffff8801b64af968 (size 512):
comm "btrfs-cleaner", pid 3317, jiffies 4306810886 (age 903.272s)
hex dump (first 32 bytes):
00 82 01 07 00 ea ff ff c0 83 01 07 00 ea ff ff ................
80 82 01 07 00 ea ff ff c0 87 01 07 00 ea ff ff ................
backtrace:
[<ffffffff816875cc>] kmemleak_alloc+0x5c/0xc0
[<ffffffff8114aec3>] kmem_cache_alloc_trace+0x163/0x240
[<ffffffff8127a290>] btrfs_defrag_file+0xf0/0xb20
[<ffffffff8125d9a5>] btrfs_run_defrag_inodes+0x165/0x210
[<ffffffff812479d7>] cleaner_kthread+0x177/0x190
[<ffffffff81075c7d>] kthread+0x8d/0xa0
[<ffffffff816af5f4>] kernel_thread_helper+0x4/0x10
[<ffffffffffffffff>] 0xffffffffffffffff
"pages" is not always freed. Fix it removing the unnecesary additional return.
Signed-off-by: Diego Calleja <diegocg@gmail.com>
---
fs/btrfs/ioctl.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: linux/fs/btrfs/ioctl.c
===================================================================
--- linux.orig/fs/btrfs/ioctl.c
+++ linux/fs/btrfs/ioctl.c
@@ -1130,17 +1130,15 @@ int btrfs_defrag_file(struct inode *inod
disk_super = &root->fs_info->super_copy;
features = btrfs_super_incompat_flags(disk_super);
if (range->compress_type == BTRFS_COMPRESS_LZO) {
features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO;
btrfs_set_super_incompat_flags(disk_super, features);
}
- if (!file)
- kfree(ra);
- return defrag_count;
+ ret = defrag_count;
out_ra:
if (!file)
kfree(ra);
kfree(pages);
return ret;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] btrfs: fix memory leak in btrfs_defrag_file
2011-09-01 14:33 [PATCH] btrfs: fix memory leak in btrfs_defrag_file Diego Calleja
@ 2011-09-02 1:46 ` Li Zefan
2011-09-22 10:36 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: Li Zefan @ 2011-09-02 1:46 UTC (permalink / raw)
To: diegocg; +Cc: Chris Mason, linux-btrfs
Diego Calleja wrote:
> kmemleak found this:
> unreferenced object 0xffff8801b64af968 (size 512):
> comm "btrfs-cleaner", pid 3317, jiffies 4306810886 (age 903.272s)
> hex dump (first 32 bytes):
> 00 82 01 07 00 ea ff ff c0 83 01 07 00 ea ff ff ................
> 80 82 01 07 00 ea ff ff c0 87 01 07 00 ea ff ff ................
> backtrace:
> [<ffffffff816875cc>] kmemleak_alloc+0x5c/0xc0
> [<ffffffff8114aec3>] kmem_cache_alloc_trace+0x163/0x240
> [<ffffffff8127a290>] btrfs_defrag_file+0xf0/0xb20
> [<ffffffff8125d9a5>] btrfs_run_defrag_inodes+0x165/0x210
> [<ffffffff812479d7>] cleaner_kthread+0x177/0x190
> [<ffffffff81075c7d>] kthread+0x8d/0xa0
> [<ffffffff816af5f4>] kernel_thread_helper+0x4/0x10
> [<ffffffffffffffff>] 0xffffffffffffffff
>
> "pages" is not always freed. Fix it removing the unnecesary additional return.
>
> Signed-off-by: Diego Calleja <diegocg@gmail.com>
>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] btrfs: fix memory leak in btrfs_defrag_file
2011-09-01 14:33 [PATCH] btrfs: fix memory leak in btrfs_defrag_file Diego Calleja
2011-09-02 1:46 ` Li Zefan
@ 2011-09-22 10:36 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2011-09-22 10:36 UTC (permalink / raw)
To: Diego Calleja; +Cc: Chris Mason, linux-btrfs
On Thu, Sep 01, 2011 at 04:33:57PM +0200, Diego Calleja wrote:
> kmemleak found this:
> unreferenced object 0xffff8801b64af968 (size 512):
> comm "btrfs-cleaner", pid 3317, jiffies 4306810886 (age 903.272s)
> hex dump (first 32 bytes):
> 00 82 01 07 00 ea ff ff c0 83 01 07 00 ea ff ff ................
> 80 82 01 07 00 ea ff ff c0 87 01 07 00 ea ff ff ................
> backtrace:
> [<ffffffff816875cc>] kmemleak_alloc+0x5c/0xc0
> [<ffffffff8114aec3>] kmem_cache_alloc_trace+0x163/0x240
> [<ffffffff8127a290>] btrfs_defrag_file+0xf0/0xb20
> [<ffffffff8125d9a5>] btrfs_run_defrag_inodes+0x165/0x210
> [<ffffffff812479d7>] cleaner_kthread+0x177/0x190
> [<ffffffff81075c7d>] kthread+0x8d/0xa0
> [<ffffffff816af5f4>] kernel_thread_helper+0x4/0x10
> [<ffffffffffffffff>] 0xffffffffffffffff
>
> "pages" is not always freed. Fix it removing the unnecesary additional return.
>
> Signed-off-by: Diego Calleja <diegocg@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
>
> ---
> fs/btrfs/ioctl.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> Index: linux/fs/btrfs/ioctl.c
> ===================================================================
> --- linux.orig/fs/btrfs/ioctl.c
> +++ linux/fs/btrfs/ioctl.c
> @@ -1130,17 +1130,15 @@ int btrfs_defrag_file(struct inode *inod
> disk_super = &root->fs_info->super_copy;
> features = btrfs_super_incompat_flags(disk_super);
> if (range->compress_type == BTRFS_COMPRESS_LZO) {
> features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO;
> btrfs_set_super_incompat_flags(disk_super, features);
> }
>
> - if (!file)
> - kfree(ra);
> - return defrag_count;
> + ret = defrag_count;
>
> out_ra:
> if (!file)
> kfree(ra);
> kfree(pages);
> return ret;
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-22 10:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-01 14:33 [PATCH] btrfs: fix memory leak in btrfs_defrag_file Diego Calleja
2011-09-02 1:46 ` Li Zefan
2011-09-22 10:36 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox