Skip to content

Commit 0257d99

Browse files
Peng Zhangakpm00
authored andcommitted
maple_tree: make maple state reusable after mas_empty_area()
Make mas->min and mas->max point to a node range instead of a leaf entry range. This allows mas to still be usable after mas_empty_area() returns. Users would get unexpected results from other operations on the maple state after calling the affected function. For example, x86 MAP_32BIT mmap() acts as if there is no suitable gap when there should be one. Link: https://lkml.kernel.org/r/20230505145829.74574-1-zhangpeng.00@bytedance.com Fixes: 54a611b ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> Reported-by: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com> Reported-by: Tad <support@spotco.us> Reported-by: Michael Keyes <mgkeyes@vigovproductions.net> Link: https://lore.kernel.org/linux-mm/32f156ba80010fd97dbaf0a0cdfc84366608624d.camel@intel.com/ Link: https://lore.kernel.org/linux-mm/e6108286ac025c268964a7ead3aab9899f9bc6e9.camel@spotco.us/ Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> Tested-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent ac9a786 commit 0257d99

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

lib/maple_tree.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,15 +5317,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
53175317

53185318
mt = mte_node_type(mas->node);
53195319
pivots = ma_pivots(mas_mn(mas), mt);
5320-
if (offset)
5321-
mas->min = pivots[offset - 1] + 1;
5322-
5323-
if (offset < mt_pivots[mt])
5324-
mas->max = pivots[offset];
5325-
5326-
if (mas->index < mas->min)
5327-
mas->index = mas->min;
5328-
5320+
min = mas_safe_min(mas, pivots, offset);
5321+
if (mas->index < min)
5322+
mas->index = min;
53295323
mas->last = mas->index + size - 1;
53305324
return 0;
53315325
}

0 commit comments

Comments
 (0)