aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2011-02-06 14:58:21 -0500
committerChris Mason <chris.mason@oracle.com>2011-02-14 16:21:31 -0500
commit67100f255dba284bcbb5ce795355dad1cff35658 (patch)
treef343a1c2bb24b4a4cc965933b41e6d0271fe05fb /fs
parent51788b1bdd0d68345bab0af4301e7fa429277228 (diff)
Btrfs - Fix memory leak in btrfs_init_new_device()
Memory allocated by calling kstrdup() should be freed. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/volumes.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 7cad59353b0..dadaaa8005c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1603,12 +1603,14 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
1603 1603
1604 ret = find_next_devid(root, &device->devid); 1604 ret = find_next_devid(root, &device->devid);
1605 if (ret) { 1605 if (ret) {
1606 kfree(device->name);
1606 kfree(device); 1607 kfree(device);
1607 goto error; 1608 goto error;
1608 } 1609 }
1609 1610
1610 trans = btrfs_start_transaction(root, 0); 1611 trans = btrfs_start_transaction(root, 0);
1611 if (IS_ERR(trans)) { 1612 if (IS_ERR(trans)) {
1613 kfree(device->name);
1612 kfree(device); 1614 kfree(device);
1613 ret = PTR_ERR(trans); 1615 ret = PTR_ERR(trans);
1614 goto error; 1616 goto error;