Cleanup and sanity-checking of before/after null-check and copy+paste errors (Coverit...

[palacios.git] / palacios / src / palacios / vmm_rbtree.c

diff --git a/palacios/src/palacios/vmm_rbtree.c b/palacios/src/palacios/vmm_rbtree.c
index 3b15bcf..ff63faa 100644 (file)
--- a/palacios/src/palacios/vmm_rbtree.c
+++ b/palacios/src/palacios/vmm_rbtree.c
@@ -287,7 +287,10 @@ void v3_rb_erase(struct rb_node *node, struct rb_root *root)
        root->rb_node = child;
 
  color:
-    if (color == RB_BLACK)
+    // parent check here is because a possible
+    // codepath here has parent=null, which would
+    // be a disaster in kernel
+    if (color == RB_BLACK && parent) 
        __rb_erase_color(child, parent, root);
 }