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

Commit 0f5d42b2 authored by Josef Bacik's avatar Josef Bacik
Browse files

Btrfs: remove extent mapping if we fail to add chunk 



I got a double free error when unmounting a file system that failed to add a
chunk during its operation.  This is because we will kfree the mapping that
we created but leave the extent_map in the em_tree for chunks.  So to fix
this just remove the extent_map when we error out so we don't run into this
problem.  Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 04487488

fs/btrfs/volumes.c

+12 −2
Original line number Diff line number Diff line
@@ -3821,9 +3821,10 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, 
	write_lock(&em_tree->lock);

	ret = add_extent_mapping(em_tree, em);

	write_unlock(&em_tree->lock);

	if (ret) {

		free_extent_map(em);

	if (ret)

		goto error;

	}



	for (i = 0; i < map->num_stripes; ++i) {

		struct btrfs_device *device;
@@ -3848,6 +3849,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, 
		goto error_dev_extent;

	}



	free_extent_map(em);

	kfree(devices_info);

	return 0;
@@ -3863,6 +3865,14 @@ error_dev_extent: 
			break;

		}

	}

	write_lock(&em_tree->lock);

	remove_extent_mapping(em_tree, em);

	write_unlock(&em_tree->lock);



	/* One for our allocation */

	free_extent_map(em);

	/* One for the tree reference */

	free_extent_map(em);

error:

	kfree(map);

	kfree(devices_info);