Skip to contentSkip to conversation

maple_tree-should-get-pivots-boundary-by-type.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Feb 1, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: should get pivots boundary by type
has been removed from the -mm tree. Its filename was
maple_tree-should-get-pivots-boundary-by-type.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: maple_tree: should get pivots boundary by type
Date: Sat, 12 Nov 2022 23:43:08 +0000

We should get pivots boundary by type. Fixes a potential overindexing of mt_pivots[].

Fixes 54a611b60590 ("Maple Tree: add new data structure")

---

 lib/maple_tree.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-should-get-pivots-boundary-by-type +3 -2
@@ -670,12 +670,13 @@ static inline unsigned long mte_pivot(co
 				 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:

_

Patches currently in -mm which might be from [email protected] are