From f5e9ed5c4e35a4cc2db7c10cf855e701472af864 Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Fri, 11 Nov 2016 21:17:10 +0530 Subject: [PATCH] mempool: fix leak if populate fails This patch fixes the issue of memzone not being freed incase the rte_mempool_populate_phys fails in the rte_mempool_populate_default This issue was identified when testing with OVS ~2.6 - configure the system with low memory (e.g. < 500 MB) - add bridge and dpdk interfaces - delete brigde - keep on repeating the above sequence. Fixes: d1d914ebbc25 ("mempool: allocate in several memory chunks by default") Signed-off-by: Nipun Gupta Acked-by: Olivier Matz --- lib/librte_mempool/rte_mempool.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index e94e56fcce..aa513b9733 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -578,8 +578,10 @@ rte_mempool_populate_default(struct rte_mempool *mp) mz->len, pg_sz, rte_mempool_memchunk_mz_free, (void *)(uintptr_t)mz); - if (ret < 0) + if (ret < 0) { + rte_memzone_free(mz); goto fail; + } } return mp->size; -- 2.20.1