Skip to contentSkip to conversation

maple_tree: Remove a BUG_ON() in mas_alloc_nodes()

PATCH Applied Petr Tesarik 2 participants 2 messages Feb 13, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 maple_tree: Remove a BUG_ON() in mas_alloc_nodes()

Remove a BUG_ON() right before a WARN_ON() with the same condition.

Calling WARN_ON() and BUG_ON() here is definitely wrong. Since the goal is generally to remove BUG_ON() invocations from the kernel, keep only the WARN_ON().

Fixes 067311d33e65 ("maple_tree: separate ma_state node from status")
---
 lib/maple_tree.c | 1 -
 1 file changed, 1 deletion(-)
lib/maple_tree.c +0 -1
index f7153ade1be5..0f2111d436c4 100644
@@ -1245,7 +1245,6 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp)
 	if (mas->mas_flags & MA_STATE_PREALLOC) {
 		if (allocated)
 			return;
-		BUG_ON(!allocated);
 		WARN_ON(!allocated);
 	}
 
Signature · 1 line
2.48.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Petr Tesarik

Remove a BUG_ON() right before a WARN_ON() with the same condition.

Calling WARN_ON() and BUG_ON() here is definitely wrong. Since the goal is generally to remove BUG_ON() invocations from the kernel, keep only the WARN_ON().

Sure.. but this isn't going to have the end result of not crashing. We ran out of allocations so we will very quickly be dereferencing NULL.

Care has been taken to avoid this from happening, so I'm fine with either as this comes up in testing only. In fact, I probably added this during the testing and it slipped through. Thanks for finding it.

Quoted 3 lines
Fixes 067311d33e65 ("maple_tree: separate ma_state node from status")
Quoted 19 lines
---
 lib/maple_tree.c | 1 -
 1 file changed, 1 deletion(-)
lib/maple_tree.c +0 -1
index f7153ade1be5..0f2111d436c4 100644
@@ -1245,7 +1245,6 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp)
 	if (mas->mas_flags & MA_STATE_PREALLOC) {
 		if (allocated)
 			return;
-		BUG_ON(!allocated);
 		WARN_ON(!allocated);
 	}
 
Signature · 1 line
2.48.1