2 files changed, 7 insertions, 1 deletions
diff --git a/src/vppinfra/elog.c b/src/vppinfra/elog.c
index 12e3f5d4bd8..182ca127b12 100644
--- a/src/vppinfra/elog.c
+++ b/src/vppinfra/elog.c
@@ -108,6 +108,13 @@ elog_event_type_register (elog_main_t * em, elog_event_type_t * t)
 
   elog_lock (em);
 
+  /* Multiple simultaneous registration attempts, */
+  if (t->type_index_plus_one > 0)
+    {
+      elog_unlock (em);
+      return t->type_index_plus_one - 1;
+    }
+
   l = vec_len (em->event_types);
 
   t->type_index_plus_one = 1 + l;
diff --git a/src/vppinfra/elog.h b/src/vppinfra/elog.h
index 359868dd0f0..05085b264df 100644
--- a/src/vppinfra/elog.h
+++ b/src/vppinfra/elog.h
@@ -309,7 +309,6 @@ elog_event_data_inline (elog_main_t * em,
 	track_index = elog_track_register (em, track);
     }
 
-  ASSERT (type_index < vec_len (em->event_types));
   ASSERT (track_index < vec_len (em->tracks));
   ASSERT (is_pow2 (vec_len (em->event_ring)));