diff options
| author |   Juraj Sloboda <jsloboda@cisco.com> | 2018-10-22 10:59:45 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-10-22 09:56:52 +0000 |
| commit | 430634c457da5dd04f481da0118bab581ace732e (patch) | |
| tree | 5a37397f88533838dcff2a8dd4bfd234bce6065a | |
| parent | 95b1b10e54545132ba55821e32c2f1a48d0e0e16 (diff) | |
Fix dereferencing null string in dpdk_early_init
Change-Id: Iffba7ebe5af8fadc0251f3a10022739d45f394ce
Signed-off-by: Juraj Sloboda <jsloboda@cisco.com>
| -rw-r--r-- | src/plugins/dpdk/main.c | 1 | ||||
| -rw-r--r-- | src/vppinfra/linux/mem.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c index 2bea10185cd..d22b671e008 100644 --- a/src/plugins/dpdk/main.c +++ b/src/plugins/dpdk/main.c @@ -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))) { diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c index eb4312b2725..253ae87845b 100644 --- a/src/vppinfra/linux/mem.c +++ b/src/vppinfra/linux/mem.c @@ -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) |