From 1f48366084a7b046bcb7741ed4e607774f96e3da Mon Sep 17 00:00:00 2001
From: Shen Feng <shen@cn.fujitsu.com>
Date: Mon, 5 Jan 2009 15:43:42 -0500
Subject: [PATCH] Btrfs: fix a memory leak in btrfs_get_sb
subvol_name should be freed if error occurs.
Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
---
fs/btrfs/super.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 3814238d6eba4..ccdcb7bb7ad8f 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -429,7 +429,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
error = btrfs_parse_early_options(data, mode, fs_type,
&subvol_name, &fs_devices);
if (error)
- goto error;
+ return error;
error = btrfs_scan_one_device(dev_name, mode, fs_type, &fs_devices);
if (error)
@@ -468,7 +468,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
- goto error;
+ goto error_free_subvol_name;
}
btrfs_sb(s)->fs_info->bdev_holder = fs_type;
@@ -485,14 +485,14 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
up_write(&s->s_umount);
deactivate_super(s);
error = PTR_ERR(root);
- goto error;
+ goto error_free_subvol_name;
}
if (!root->d_inode) {
dput(root);
up_write(&s->s_umount);
deactivate_super(s);
error = -ENXIO;
- goto error;
+ goto error_free_subvol_name;
}
}
@@ -508,7 +508,6 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
btrfs_close_devices(fs_devices);
error_free_subvol_name:
kfree(subvol_name);
-error:
return error;
}
--
GitLab