]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Fix leak in __btrfs_map_block error path
authorDave Jones <davej@redhat.com>
Tue, 30 Jul 2013 17:42:17 +0000 (13:42 -0400)
committerChris Mason <chris.mason@fusionio.com>
Sun, 1 Sep 2013 12:04:45 +0000 (08:04 -0400)
If we bail out when the stripe alloc fails, we need to undo the
earlier allocation of raid_map.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/volumes.c

index 93f39b1e71737582111797790392715623f55fee..44abd151132a64ff855fea9c47f6005310940113 100644 (file)
@@ -4673,6 +4673,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
        }
        bbio = kzalloc(btrfs_bio_size(num_alloc_stripes), GFP_NOFS);
        if (!bbio) {
+               kfree(raid_map);
                ret = -ENOMEM;
                goto out;
        }