MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-12-23 19:07:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

maple_tree: make mas_validate_limits() check root node and node limit

Browse Source 
Update mas_validate_limits() to check root node, check node limit pivot if
there is enough room for it to exist and check data_end.  Remove the check
for child existence as it is done in mas_validate_child_slot().

Link: https://lkml.kernel.org/r/20230711035444.526-6-zhangpeng.00@bytedance.com
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Peng Zhang 2023-07-11 11:54:41 +08:00 committed by Andrew Morton
parent e93fda5a1a
commit 33af39d024
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/maple_tree.c
View File

@ -7120,7 +7120,9 @@ static void mas_validate_child_slot(struct ma_state *mas)
} }
/* /*
* Validate all pivots are within mas->min and mas->max. * Validate all pivots are within mas->min and mas->max, check metadata ends
* where the maximum ends and ensure there is no slots or pivots set outside of
* the end of the data.
*/ */
static void mas_validate_limits(struct ma_state *mas) static void mas_validate_limits(struct ma_state *mas)
{ {
@ -7130,26 +7132,15 @@ static void mas_validate_limits(struct ma_state *mas)
void __rcu **slots = ma_slots(mte_to_node(mas->node), type); void __rcu **slots = ma_slots(mte_to_node(mas->node), type);
unsigned long *pivots = ma_pivots(mas_mn(mas), type); unsigned long *pivots = ma_pivots(mas_mn(mas), type);
/* all limits are fine here. */
if (mte_is_root(mas->node))
return;
for (i = 0; i < mt_slots[type]; i++) { for (i = 0; i < mt_slots[type]; i++) {
unsigned long piv; unsigned long piv;
piv = mas_safe_pivot(mas, pivots, i, type); piv = mas_safe_pivot(mas, pivots, i, type);
if (!piv && (i != 0)) if (!piv && (i != 0)) {
break; pr_err("Missing node limit pivot at %p[%u]",
mas_mn(mas), i);
if (!mte_is_leaf(mas->node)) { MAS_WARN_ON(mas, 1);
void *entry = mas_slot(mas, slots, i);
if (!entry)
pr_err("%p[%u] cannot be null\n",
mas_mn(mas), i);
MT_BUG_ON(mas->tree, !entry);
} }
if (prev_piv > piv) { if (prev_piv > piv) {
@ -7172,6 +7163,13 @@ static void mas_validate_limits(struct ma_state *mas)
if (piv == mas->max) if (piv == mas->max)
break; break;
} }
if (mas_data_end(mas) != i) {
pr_err("node%p: data_end %u != the last slot offset %u\n",
mas_mn(mas), mas_data_end(mas), i);
MT_BUG_ON(mas->tree, 1);
}
for (i += 1; i < mt_slots[type]; i++) { for (i += 1; i < mt_slots[type]; i++) {
void *entry = mas_slot(mas, slots, i); void *entry = mas_slot(mas, slots, i);