commit 5226d26d1191fec2cb2bf1d896aa1f7ae1114cc4
author Florin Coras <fcoras@cisco.com> Mon Apr 27 22:41:39 2020 +0000
committer Dave Barach <openvpp@barachs.net> Tue Apr 28 00:56:19 2020 +0000
tree 666e49a1e293104c28ace7921560d554d57ade1e
parent 3ff8e23d7d44b5394112e3558206a7165642116a

svm: null instead of panic if fifo hdr alloc fails

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I2c5c9e3e7eff8481e48a940e8420d236a16e7649

src/svm/fifo_segment.c

diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index 06b7f06..d9ca3a2 100644
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -420,8 +420,11 @@
   f = fss->free_fifos;
   if (!f)
     {
+      if (PREDICT_FALSE (fsh_n_free_bytes (fsh) < sizeof (svm_fifo_t)))
+	return 0;
+
       void *oldheap = ssvm_push_heap (fsh->ssvm_sh);
-      f = clib_mem_alloc_aligned (sizeof (*f), CLIB_CACHE_LINE_BYTES);
+      f = clib_mem_alloc_aligned_or_null (sizeof (*f), CLIB_CACHE_LINE_BYTES);
       ssvm_pop_heap (oldheap);
       if (!f)
 	return 0;