From: Lijian.Zhang <Lijian.Zhang@arm.com>
Date: Wed, 3 Apr 2019 08:32:30 +0000 (+0800)
Subject: dpdk: check result of rte_mempool_create_empty
X-Git-Tag: v20.01-rc0~392
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F20204%2F6;p=vpp.git

dpdk: check result of rte_mempool_create_empty

Check the returned pointer, report error and return in case of failure.
This avoids crashing without any useful clues or debug messages.

Type: fix

Change-Id: I15d0735a531c2d9a8b6f67b7d6fe326b98c963c3
Signed-off-by: Lijian Zhang <Lijian.Zhang@arm.com>
Reviewed-by: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
---

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index dd7bf4cc9d1..6add0630d85 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -55,6 +55,13 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
   mp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
 				 elt_size, 512, sizeof (priv),
 				 bp->numa_node, 0);
+  if (!mp)
+    {
+      vec_free (name);
+      return clib_error_return (0,
+				"failed to create normal mempool for numa node %u",
+				bp->index);
+    }
   vec_reset_length (name);
 
   /* non-cached mempool */
@@ -62,6 +69,14 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
   nmp = rte_mempool_create_empty ((char *) name, vec_len (bp->buffers),
 				  elt_size, 0, sizeof (priv),
 				  bp->numa_node, 0);
+  if (!nmp)
+    {
+      rte_mempool_free (mp);
+      vec_free (name);
+      return clib_error_return (0,
+				"failed to create non-cache mempool for numa nude %u",
+				bp->index);
+    }
   vec_free (name);
 
   dpdk_mempool_by_buffer_pool_index[bp->index] = mp;