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

Commit 35f0399d authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: fix crash regarding to ulist_add_merge 



Several users reported this crash of NULL pointer or general protection,
the story is that we add a rbtree for speedup ulist iteration, and we
use krealloc() to address ulist growth, and krealloc() use memcpy to copy
old data to new memory area, so it's OK for an array as it doesn't use
pointers while it's not OK for a rbtree as it uses pointers.

So krealloc() will mess up our rbtree and it ends up with crash.

Reviewed-by: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent edd1400b

fs/btrfs/ulist.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -205,6 +205,10 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux, 
		u64 new_alloced = ulist->nodes_alloced + 128;

		u64 new_alloced = ulist->nodes_alloced + 128;

		struct ulist_node *new_nodes;

		struct ulist_node *new_nodes;

		void *old = NULL;

		void *old = NULL;

		int i;



		for (i = 0; i < ulist->nnodes; i++)

			rb_erase(&ulist->nodes[i].rb_node, &ulist->root);





		/*

		/*

		 * if nodes_alloced == ULIST_SIZE no memory has been allocated

		 * if nodes_alloced == ULIST_SIZE no memory has been allocated
@@ -224,6 +228,17 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux, 




		ulist->nodes = new_nodes;

		ulist->nodes = new_nodes;

		ulist->nodes_alloced = new_alloced;

		ulist->nodes_alloced = new_alloced;



		/*

		 * krealloc actually uses memcpy, which does not copy rb_node

		 * pointers, so we have to do it ourselves.  Otherwise we may

		 * be bitten by crashes.

		 */

		for (i = 0; i < ulist->nnodes; i++) {

			ret = ulist_rbtree_insert(ulist, &ulist->nodes[i]);

			if (ret < 0)

				return ret;

		}

	}

	}

	ulist->nodes[ulist->nnodes].val = val;

	ulist->nodes[ulist->nnodes].val = val;

	ulist->nodes[ulist->nnodes].aux = aux;

	ulist->nodes[ulist->nnodes].aux = aux;