Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b1de91 authored by Josef Bacik's avatar Josef Bacik Committed by Greg Kroah-Hartman
Browse files

btrfs: do not leak reloc root if we fail to read the fs root 



commit ca1aa2818a53875cfdd175fb5e9a2984e997cce9 upstream.

If we fail to read the fs root corresponding with a reloc root we'll
just break out and free the reloc roots.  But we remove our current
reloc_root from this list higher up, which means we'll leak this
reloc_root.  Fix this by adding ourselves back to the reloc_roots list
so we are properly cleaned up.

CC: stable@vger.kernel.org # 4.4+
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f597f873

fs/btrfs/relocation.c

+1 −0
Original line number Diff line number Diff line
@@ -4555,6 +4555,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) 
		fs_root = read_fs_root(fs_info, reloc_root->root_key.offset);

		if (IS_ERR(fs_root)) {

			err = PTR_ERR(fs_root);

			list_add_tail(&reloc_root->root_list, &reloc_roots);

			goto out_free;

		}