From b8a86c83e0a3bc75cd50562affa6e5df2fbfe0ba Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 29 Mar 2019 10:57:08 +0000 Subject: [PATCH] fbarray: fix init unlock without lock Certain failure paths of rte_fbarray_init() will unlock the mem area lock without locking it first. Fix this by properly handling the failures. Fixes: 5b61c62cfd76 ("fbarray: add internal tailq for mapped areas") Signed-off-by: Anatoly Burakov --- lib/librte_eal/common/eal_common_fbarray.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c index 31cce80a88..eb04a1e596 100644 --- a/lib/librte_eal/common/eal_common_fbarray.c +++ b/lib/librte_eal/common/eal_common_fbarray.c @@ -736,15 +736,19 @@ rte_fbarray_init(struct rte_fbarray *arr, const char *name, unsigned int len, } page_sz = sysconf(_SC_PAGESIZE); - if (page_sz == (size_t)-1) - goto fail; + if (page_sz == (size_t)-1) { + free(ma); + return -1; + } /* calculate our memory limits */ mmap_len = calc_data_size(page_sz, elt_sz, len); data = eal_get_virtual_area(NULL, &mmap_len, page_sz, 0, 0); - if (data == NULL) - goto fail; + if (data == NULL) { + free(ma); + return -1; + } rte_spinlock_lock(&mem_area_lock); -- 2.20.1