maple_tree: Protect ma_pivots() from using dead nodes

Ensure the node type being used isn't going to return an invalid
pointer.

Signed-off-by: Liam Howlett <Liam.Howlett@oracle.com>

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index df352f6ccc240979f2fb03b9f096e4afc579a8cc..2fdbfc73a85418a73a95156b67a6a430c00211dc 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -535,6 +535,12 @@ static inline bool ma_dead_node(const struct maple_node *node)
 
        return (parent == node);
 }
+
+static inline bool ma_dead_pivots(const unsigned long *piv)
+{
+       return (piv == NULL);
+}
+
 /*
  * mte_dead_node() - check if the @enode is dead.
  * @enode: The encoded maple node
@@ -621,6 +627,9 @@ static inline unsigned int mas_alloc_req(const struct ma_state *mas)
 static inline unsigned long *ma_pivots(struct maple_node *node,
                                           enum maple_type type)
 {
+       if (unlikely(ma_dead_node(node)))
+               return NULL;
+
        switch (type) {
        case maple_arange_64:
                return node->ma64.pivot;
@@ -1086,8 +1095,11 @@ static int mas_ascend(struct ma_state *mas)
                a_type = mas_parent_enum(mas, p_enode);
                a_node = mte_parent(p_enode);
                a_slot = mte_parent_slot(p_enode);
-               pivots = ma_pivots(a_node, a_type);
                a_enode = mt_mk_node(a_node, a_type);
+               pivots = ma_pivots(a_node, a_type);
+
+               if (unlikely(ma_dead_pivots(pivots)))
+                       return 1;
 
                if (!set_min && a_slot) {
                        set_min = true;
@@ -1428,6 +1440,9 @@ static inline unsigned char mas_data_end(struct ma_state *mas)
                return ma_meta_end(node, type);
 
        pivots = ma_pivots(node, type);
+       if (unlikely(ma_dead_pivots(pivots)))
+               return 0;
+
        offset = mt_pivots[type] - 1;
        if (likely(!pivots[offset]))
                return ma_meta_end(node, type);
@@ -4497,6 +4512,9 @@ static inline int mas_prev_node(struct ma_state *mas, unsigned long min)
        node = mas_mn(mas);
        slots = ma_slots(node, mt);
        pivots = ma_pivots(node, mt);
+       if (unlikely(ma_dead_pivots(pivots)))
+               return 1;
+
        mas->max = pivots[offset];
        if (offset)
                mas->min = pivots[offset - 1] + 1;
@@ -4518,6 +4536,9 @@ static inline int mas_prev_node(struct ma_state *mas, unsigned long min)
                slots = ma_slots(node, mt);
                pivots = ma_pivots(node, mt);
                offset = ma_data_end(node, mt, pivots, mas->max);
+               if (unlikely(ma_dead_node(node)))
+                       return 1;
+
                if (offset)
                        mas->min = pivots[offset - 1] + 1;
 
@@ -4589,6 +4610,8 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node,
                node = mas_mn(mas);
                mt = mte_node_type(mas->node);
                pivots = ma_pivots(node, mt);
+               if (unlikely(ma_dead_pivots(pivots)))
+                   return 1;
        } while (unlikely(offset == ma_data_end(node, mt, pivots, mas->max)));
 
        slots = ma_slots(node, mt);
@@ -4605,6 +4628,9 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node,
                mt = mte_node_type(mas->node);
                slots = ma_slots(node, mt);
                pivots = ma_pivots(node, mt);
+               if (unlikely(ma_dead_pivots(pivots)))
+                   return 1;
+
                offset = 0;
                pivot = pivots[0];
        }
@@ -4651,12 +4677,15 @@ static inline void *mas_next_nentry(struct ma_state *mas,
                return NULL;
        }
 
-       pivots = ma_pivots(node, type);
        slots = ma_slots(node, type);
-       mas->index = mas_safe_min(mas, pivots, mas->offset);
-       if (ma_dead_node(node))
+       pivots = ma_pivots(node, type);
+       count = ma_data_end(node, type, pivots, mas->max);
+       if (unlikely(ma_dead_node(node)))
                return NULL;
 
+       mas->index = mas_safe_min(mas, pivots, mas->offset);
+       if (unlikely(ma_dead_node(node)))
+               return NULL;
        if (mas->index > max)
                return NULL;
 
@@ -4808,6 +4837,11 @@ retry:
 
        slots = ma_slots(mn, mt);
        pivots = ma_pivots(mn, mt);
+       if (unlikely(ma_dead_pivots(pivots))) {
+               mas_rewalk(mas, index);
+               goto retry;
+       }
+
        if (offset == mt_pivots[mt])
                pivot = mas->max;
        else
@@ -6606,11 +6640,11 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
        while (likely(!ma_is_leaf(mt))) {
                MT_BUG_ON(mas->tree, mte_dead_node(mas->node));
                slots = ma_slots(mn, mt);
-               pivots = ma_pivots(mn, mt);
-               max = pivots[0];
                entry = mas_slot(mas, slots, 0);
-               if (unlikely(ma_dead_node(mn)))
+               pivots = ma_pivots(mn, mt);
+               if (unlikely(ma_dead_pivots(pivots)))
                        return NULL;
+               max = pivots[0];
                mas->node = entry;
                mn = mas_mn(mas);
                mt = mte_node_type(mas->node);
@@ -6630,13 +6664,13 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
        if (likely(entry))
                return entry;
 
-       pivots = ma_pivots(mn, mt);
-       mas->index = pivots[0] + 1;
        mas->offset = 1;
        entry = mas_slot(mas, slots, 1);
-       if (unlikely(ma_dead_node(mn)))
+       pivots = ma_pivots(mn, mt);
+       if (unlikely(ma_dead_pivots(pivots)))
                return NULL;
 
+       mas->index = pivots[0] + 1;
        if (mas->index > limit)
                goto none;