From 5226d26d1191fec2cb2bf1d896aa1f7ae1114cc4 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Mon, 27 Apr 2020 22:41:39 +0000 Subject: svm: null instead of panic if fifo hdr alloc fails Type: fix Signed-off-by: Florin Coras Change-Id: I2c5c9e3e7eff8481e48a940e8420d236a16e7649 --- src/svm/fifo_segment.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/svm') diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c index 06b7f063136..d9ca3a2afe3 100644 --- a/src/svm/fifo_segment.c +++ b/src/svm/fifo_segment.c @@ -420,8 +420,11 @@ fs_try_alloc_fifo_freelist_multi_chunk (fifo_segment_header_t * fsh, 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; -- cgit 1.2.3-korg