diff mbox series

fbarray: fix init unlock without lock

Message ID 35fe9a105fbf7868fc34cef330745b33acd0527c.1553856703.git.anatoly.burakov@intel.com (mailing list archive)
State Accepted, archived
Headers
Series fbarray: fix init unlock without lock |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Anatoly Burakov March 29, 2019, 10:57 a.m. UTC 
  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 <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/eal_common_fbarray.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Thomas Monjalon March 29, 2019, 11:50 a.m. UTC | #1 
29/03/2019 11:57, Anatoly Burakov:
> 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 <anatoly.burakov@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c
index 0e7366e5e..f852c7f50 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);