d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mem: fix resource leak

Browse Source 
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 <anatoly.burakov@intel.com>
This commit is contained in:
Anatoly Burakov 2018-10-22 13:57:03 +01:00 committed by Thomas Monjalon
parent 51bc78a5a7
commit 198b66b946
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/librte_eal/linuxapp/eal/eal_memory.c
View File

@ -2135,7 +2135,7 @@ memseg_primary_init(void)
uint64_t page_sz; uint64_t page_sz;
int socket_id; int socket_id;
} *memtypes = NULL; } *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; struct rte_memseg_list *msl;
uint64_t max_mem, max_mem_per_type; uint64_t max_mem, max_mem_per_type;
unsigned int max_seglists_per_type; unsigned int max_seglists_per_type;
@ -2227,7 +2227,7 @@ memseg_primary_init(void)
if (max_seglists_per_type == 0) { if (max_seglists_per_type == 0) {
RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase %s\n", RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS)); RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
return -1; goto out;
} }
/* go through all mem types and create segment lists */ /* go through all mem types and create segment lists */
@ -2287,21 +2287,25 @@ memseg_primary_init(void)
RTE_LOG(ERR, EAL, RTE_LOG(ERR, EAL,
"No more space in memseg lists, please increase %s\n", "No more space in memseg lists, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS)); RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
return -1; goto out;
} }
msl = &mcfg->memsegs[msl_idx++]; msl = &mcfg->memsegs[msl_idx++];
if (alloc_memseg_list(msl, pagesz, n_segs, if (alloc_memseg_list(msl, pagesz, n_segs,
socket_id, cur_seglist)) socket_id, cur_seglist))
return -1; goto out;
if (alloc_va_space(msl)) { if (alloc_va_space(msl)) {
RTE_LOG(ERR, EAL, "Cannot allocate VA space for memseg list\n"); 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 static int