Skip to contentSkip to conversation

maple_tree: should get pivots boundary by type

RFC PATCH In review Wei Yang 2 participants 4 messages Nov 10, 2022 – Nov 11, 2022

Subsystems (3)
lore
Share & tools
lore

Wei Yang

author
#0 lore raw

RFC PATCH 1/1 maple_tree: should get pivots boundary by type

If my understanding is correct, we should get pivots boundary by type.

CC Liam R. Howlett <[email protected]>

---
* kernel build looks good

---
 lib/maple_tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/maple_tree.c +3 -2
index 73e2e6434e2f..2123d1930a9b 100644
@@ -669,12 +669,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:
Signature · 1 line
2.33.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Wei Yang

If my understanding is correct, we should get pivots boundary by type.

Thank you, yes - you are correct. This is a bug, and should have:

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

Please fix your commit message and add the fixes line and resend.

Quoted 32 lines
CC Liam R. Howlett <[email protected]>

---
* kernel build looks good

---
 lib/maple_tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/maple_tree.c +3 -2
index 73e2e6434e2f..2123d1930a9b 100644
@@ -669,12 +669,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:
Signature · 1 line
2.33.1
author
#2 lore raw
Quoted 5 lines · Liam Howlett
Quoted 2 lines · Wei Yang

If my understanding is correct, we should get pivots boundary by type.

Thank you, yes - you are correct. This is a bug, and should have:

Thanks. I am curious why this doesn't trigger a problem yet?

From code, it seems we may access the out of boundary array.

Quoted 7 lines
Fixes 54a611b60590 (Maple Tree: add new data structure)

Please fix your commit message and add the fixes line and resend.

Signature · 2 lines
Wei Yang
Help you, Help me
#3 lore raw
Quoted 10 lines · Wei Yang
Quoted 5 lines · Liam Howlett
Quoted 2 lines · Wei Yang

If my understanding is correct, we should get pivots boundary by type.

Thank you, yes - you are correct. This is a bug, and should have:

Thanks. I am curious why this doesn't trigger a problem yet?

From code, it seems we may access the out of boundary array.

yes, it would likely access the array out of bounds. This code is not used by the mm code right now.

Quoted 12 lines
Quoted 8 lines
Fixes 54a611b60590 (Maple Tree: add new data structure)

Please fix your commit message and add the fixes line and resend.

Signature · 2 lines
Wei Yang
Help you, Help me