diff options
| author | Eric W. Biederman | 2019-01-30 14:54:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-06 17:30:14 +0100 |
| commit | 9ee5987f311fc2df9b75fe08fac51cea520f8e84 (patch) | |
| tree | 08835c7618bf2e6d3f724f47632be6a09c285be1 /fs | |
| parent | Btrfs: fix deadlock when allocating tree block during leaf/node split (diff) | |
| download | kernel-qcow2-linux-9ee5987f311fc2df9b75fe08fac51cea520f8e84.tar.gz kernel-qcow2-linux-9ee5987f311fc2df9b75fe08fac51cea520f8e84.tar.xz kernel-qcow2-linux-9ee5987f311fc2df9b75fe08fac51cea520f8e84.zip | |
btrfs: On error always free subvol_name in btrfs_mount
commit 532b618bdf237250d6d4566536d4b6ce3d0a31fe upstream.
The subvol_name is allocated in btrfs_parse_subvol_options and is
consumed and freed in mount_subvol. Add a free to the error paths that
don't call mount_subvol so that it is guaranteed that subvol_name is
freed when an error happens.
Fixes: 312c89fbca06 ("btrfs: cleanup btrfs_mount() using btrfs_mount_root()")
Cc: stable@vger.kernel.org # v4.19+
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8ad145820ea8..8888337a95b6 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1677,6 +1677,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, flags | SB_RDONLY, device_name, data); if (IS_ERR(mnt_root)) { root = ERR_CAST(mnt_root); + kfree(subvol_name); goto out; } @@ -1686,12 +1687,14 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, if (error < 0) { root = ERR_PTR(error); mntput(mnt_root); + kfree(subvol_name); goto out; } } } if (IS_ERR(mnt_root)) { root = ERR_CAST(mnt_root); + kfree(subvol_name); goto out; } |