summary refs log tree commit diff
path: root/lib/maple_tree.c
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2022-11-12 23:43:08 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-09 11:28:08 +0100
commite0514483fa88f4e4960a080ad0613c1503386f34 (patch)
treeae707b42c083967a4c8fa227cff8b4f1ad684dd1 /lib/maple_tree.c
parent29e774dcb27116c06b9c57b1f1f14a1623738989 (diff)
downloadlinux-e0514483fa88f4e4960a080ad0613c1503386f34.tar.gz
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: 54a611b60590 ("Maple Tree: add new data structure")
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'lib/maple_tree.c')
-rw-r--r--lib/maple_tree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index fe21bf276d91..5bfaae60ed8b 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: