Unverified Commit e4c7e358 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14013 maple_tree: correct tree corruption on spanning store 

Merge Pull Request from: @ci-robot 
 
PR sync from: Kaixiong Yu <yukaixiong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PDJQ7NUXQXPY6RI6ES34I2GW2Z3YFHYA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2YWJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14013

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 1cd6a0f2 f81e6ab8

lib/maple_tree.c

+6 −6
Original line number Diff line number Diff line
@@ -2239,6 +2239,8 @@ static inline void mas_node_or_none(struct ma_state *mas, 


/*

 * mas_wr_node_walk() - Find the correct offset for the index in the @mas.

 *                      If @mas->index cannot be found within the containing

 *                      node, we traverse to the last entry in the node.

 * @wr_mas: The maple write state

 *

 * Uses mas_slot_locked() and does not need to worry about dead nodes.
@@ -3655,7 +3657,7 @@ static bool mas_wr_walk(struct ma_wr_state *wr_mas) 
	return true;

}



static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)

static void mas_wr_walk_index(struct ma_wr_state *wr_mas)

{

	struct ma_state *mas = wr_mas->mas;
@@ -3664,11 +3666,9 @@ static bool mas_wr_walk_index(struct ma_wr_state *wr_mas) 
		wr_mas->content = mas_slot_locked(mas, wr_mas->slots,

						  mas->offset);

		if (ma_is_leaf(wr_mas->type))

			return true;

			return;

		mas_wr_walk_traverse(wr_mas);



	}

	return true;

}

/*

 * mas_extend_spanning_null() - Extend a store of a %NULL to include surrounding %NULLs.
@@ -3899,8 +3899,8 @@ static inline int mas_wr_spanning_store(struct ma_wr_state *wr_mas) 
	memset(&b_node, 0, sizeof(struct maple_big_node));

	/* Copy l_mas and store the value in b_node. */

	mas_store_b_node(&l_wr_mas, &b_node, l_mas.end);

	/* Copy r_mas into b_node. */

	if (r_mas.offset <= r_mas.end)

	/* Copy r_mas into b_node if there is anything to copy. */

	if (r_mas.max > r_mas.last)

		mas_mab_cp(&r_mas, r_mas.offset, r_mas.end,

			   &b_node, b_node.b_end + 1);

	else