Fix dereferencing null string in dpdk_early_init 40/15440/2
authorJuraj Sloboda <jsloboda@cisco.com>
Mon, 22 Oct 2018 08:59:45 +0000 (10:59 +0200)
committerDamjan Marion <dmarion@me.com>
Mon, 22 Oct 2018 09:56:52 +0000 (09:56 +0000)
Change-Id: Iffba7ebe5af8fadc0251f3a10022739d45f394ce
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
src/plugins/dpdk/main.c
src/vppinfra/linux/mem.c

index 2bea101..d22b671 100644 (file)
@@ -125,6 +125,7 @@ dpdk_early_init (vlib_main_t *vm)
 check_hugetlb:
   alloc.flags = CLIB_MEM_VM_F_SHARED | CLIB_MEM_VM_F_HUGETLB | CLIB_MEM_VM_F_HUGETLB_PREALLOC;
   alloc.size = 1;
+  alloc.name = "dpdk_early_init";
 
   if ((err = clib_mem_vm_ext_alloc (&alloc)))
     {
index eb4312b..253ae87 100644 (file)
@@ -91,6 +91,8 @@ clib_mem_create_hugetlb_fd (char *name, int *fdp)
   char template[] = "/tmp/hugepage_mount.XXXXXX";
   u8 *filename;
 
+  ASSERT (name);
+
   if (memfd_hugetlb_supported)
     {
       if ((fd = memfd_create (name, MFD_HUGETLB)) != -1)