From: Wei Yang Date: Sat, 12 Nov 2022 23:43:08 +0000 (+0000) Subject: maple_tree: should get pivots boundary by type X-Git-Tag: baikal/aarch64/sdk6.1~140 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=3b382038e2e76f44d40f004c9c18945e325d52b5;p=kernel.git maple_tree: should get pivots boundary by type [ Upstream commit ab6ef70a8b0d314c2160af70b0de984664d675e0 ] We should get pivots boundary by type. Fixes a potential overindexing of mt_pivots[]. Link: https://lkml.kernel.org/r/20221112234308.23823-1-richard.weiyang@gmail.com Fixes: 6b5ffa9b4f4f ("Maple Tree: add new data structure") Signed-off-by: Wei Yang Reviewed-by: Liam R. Howlett Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- diff --git a/lib/maple_tree.c b/lib/maple_tree.c index fe21bf276d91c..5bfaae60ed8b6 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -665,12 +665,13 @@ static inline unsigned long mte_pivot(const struct maple_enode *mn, unsigned char piv) { struct maple_node *node = mte_to_node(mn); + enum maple_type type = mte_node_type(mn); - if (piv >= mt_pivots[piv]) { + if (piv >= mt_pivots[type]) { WARN_ON(1); return 0; } - switch (mte_node_type(mn)) { + switch (type) { case maple_arange_64: return node->ma64.pivot[piv]; case maple_range_64: