diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2010-01-06 16:57:22 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-01-17 20:40:20 -0500 |
| commit | 2423fdfb96e3f9ff3baeb6c4c78d74145547891d (patch) | |
| tree | a47f7712849dd9ab5c4a1c3371511e072abcdb29 /fs/btrfs | |
| parent | a038fab0cb873c75d6675e2bcffce8a3935bdce7 (diff) | |
| download | linux-stable-2423fdfb96e3f9ff3baeb6c4c78d74145547891d.tar.gz linux-stable-2423fdfb96e3f9ff3baeb6c4c78d74145547891d.tar.bz2 linux-stable-2423fdfb96e3f9ff3baeb6c4c78d74145547891d.zip | |
Btrfs, fix memory leaks in error paths
Stanse found 2 memory leaks in relocate_block_group and
__btrfs_map_block. cluster and multi are not freed/assigned on all
paths. Fix that.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: linux-btrfs@vger.kernel.org
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/relocation.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index a9728680eca8..ed3e4a2ec2c8 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3281,8 +3281,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) return -ENOMEM; path = btrfs_alloc_path(); - if (!path) + if (!path) { + kfree(cluster); return -ENOMEM; + } rc->extents_found = 0; rc->extents_skipped = 0; diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 198cff28766d..220dad5db017 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2649,8 +2649,10 @@ again: em = lookup_extent_mapping(em_tree, logical, *length); read_unlock(&em_tree->lock); - if (!em && unplug_page) + if (!em && unplug_page) { + kfree(multi); return 0; + } if (!em) { printk(KERN_CRIT "unable to find logical %llu len %llu\n", |