diff options
| author | Peng Zhang <zhangpeng.00@bytedance.com> | 2023-07-11 11:54:40 +0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-08-18 10:12:21 -0700 |
| commit | e93fda5a1ab7a0c6143ae8a6f231c9f5f3c417b1 (patch) | |
| tree | 356e9d3a1d6ba61df203dab24fb7e2b5a50649cd /lib/maple_tree.c | |
| parent | f8e5eac8abe3d26106e5470c735058f04f60f61e (diff) | |
maple_tree: fix mas_validate_child_slot() to check last missed slot
Don't break the loop before checking the last slot. Also here check if
non-leaf nodes are missing children.
Link: https://lkml.kernel.org/r/20230711035444.526-5-zhangpeng.00@bytedance.com
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'lib/maple_tree.c')
| -rw-r--r-- | lib/maple_tree.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 9ce78e5e6084..af8fb75ad688 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7093,11 +7093,12 @@ static void mas_validate_child_slot(struct ma_state *mas) for (i = 0; i < mt_slots[type]; i++) { child = mas_slot(mas, slots, i); - if (!pivots[i] || pivots[i] == mas->max) - break; - if (!child) - break; + if (!child) { + pr_err("Non-leaf node lacks child at %p[%u]\n", + mas_mn(mas), i); + MT_BUG_ON(mas->tree, 1); + } if (mte_parent_slot(child) != i) { pr_err("Slot error at %p[%u]: child %p has pslot %u\n", @@ -7112,6 +7113,9 @@ static void mas_validate_child_slot(struct ma_state *mas) mte_to_node(mas->node)); MT_BUG_ON(mas->tree, 1); } + + if (i < mt_pivots[type] && pivots[i] == mas->max) + break; } } |