在 2023/5/5 01:55, Liam R. Howlett 写道:
Do not update the min and max of the maple state to the slot of the leaf
node. Leaving the min and max to the node entry allows for the maple
state to be used in other operations.
Users would get unexpected results from other operations on the maple
state after calling the affected function.
Reported-by: "Edgecombe, Rick P" <rick.p.edgecombe@xxxxxxxxx>
Reported-by: Tad <support@xxxxxxxxx>
Reported-by: Michael Keyes <mgkeyes@xxxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/linux-mm/32f156ba80010fd97dbaf0a0cdfc84366608624d.camel@xxxxxxxxx/
Link: https://lore.kernel.org/linux-mm/e6108286ac025c268964a7ead3aab9899f9bc6e9.camel@xxxxxxxxx/
Fixes: Fixes: 54a611b60590 ("Maple Tree: add new data structure")
Cc: <Stable@xxxxxxxxxxxxxxx>
Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
---
lib/maple_tree.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 110a36479dced..1c4bc7a988ed3 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5285,10 +5285,6 @@ static inline int mas_sparse_area(struct ma_state *mas, unsigned long min,
int mas_empty_area(struct ma_state *mas, unsigned long min,
unsigned long max, unsigned long size)
{
- unsigned char offset;
- unsigned long *pivots;
- enum maple_type mt;
-
if (min >= max)
return -EINVAL;
@@ -5311,18 +5307,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
if (unlikely(mas_is_err(mas)))
return xa_err(mas->node);
- offset = mas->offset;
- if (unlikely(offset == MAPLE_NODE_SLOTS))
+ if (unlikely(mas->offset == MAPLE_NODE_SLOTS))
return -EBUSY;
- mt = mte_node_type(mas->node);
- pivots = ma_pivots(mas_mn(mas), mt);
- if (offset)
- mas->min = pivots[offset - 1] + 1;
-
- if (offset < mt_pivots[mt])
- mas->max = pivots[offset];
-
if (mas->index < mas->min)
mas->index = mas->min;
This will bring new bugs, mas->index should take the maximum
value with mas->index and mas_safe_min(mas, pivots, offset),
otherwise there will be overwriting allocation.
Maybe you have forgotten, I have posted a patch[1] with the same
function last week. I didn't know of a place where mas was used
after mas_empty_area() before. That patch does not introduce new
bugs, but the code style has not been updated yet. If using this
patch will bring more conflicts with my patch set, so what should
I do? 😁
[1]
https://lore.kernel.org/lkml/20230425110511.11680-3-zhangpeng.00@xxxxxxxxxxxxx/
