From 198b66b9461c01558d4fb474d1485d1312bf2650 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 22 Oct 2018 13:57:03 +0100 Subject: [PATCH] mem: fix resource leak Segment preallocation code allocates an array of structures on the heap but does not free the memory afterwards. Fix it by freeing it at the end of the function, and changing control flow to always go through that code path. Coverity issue: 323524 Fixes: 1dd342d0fdc4 ("mem: improve segment list preallocation") Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov --- lib/librte_eal/linuxapp/eal/eal_memory.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 19e686eb60..fce86fda6c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -2135,7 +2135,7 @@ memseg_primary_init(void) uint64_t page_sz; int socket_id; } *memtypes = NULL; - int i, hpi_idx, msl_idx; + int i, hpi_idx, msl_idx, ret = -1; /* fail unless told to succeed */ struct rte_memseg_list *msl; uint64_t max_mem, max_mem_per_type; unsigned int max_seglists_per_type; @@ -2227,7 +2227,7 @@ memseg_primary_init(void) if (max_seglists_per_type == 0) { RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase %s\n", RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS)); - return -1; + goto out; } /* go through all mem types and create segment lists */ @@ -2287,21 +2287,25 @@ memseg_primary_init(void) RTE_LOG(ERR, EAL, "No more space in memseg lists, please increase %s\n", RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS)); - return -1; + goto out; } msl = &mcfg->memsegs[msl_idx++]; if (alloc_memseg_list(msl, pagesz, n_segs, socket_id, cur_seglist)) - return -1; + goto out; if (alloc_va_space(msl)) { RTE_LOG(ERR, EAL, "Cannot allocate VA space for memseg list\n"); - return -1; + goto out; } } } - return 0; + /* we're successful */ + ret = 0; +out: + free(memtypes); + return ret; } static int -- 2.20.1