diff mbox series

malloc: fix invalid argument handling

Message ID 35c09f98cfc044d9030c96bd6021d4b2e8246a45.1541438600.git.anatoly.burakov@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series malloc: fix invalid argument handling |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Burakov, Anatoly Nov. 5, 2018, 5:26 p.m. UTC 
  When adding memory to an external heap, do not go to unlock failure
handler because the memory hotplug lock hasn't been taken out yet.

Fixes: 7d75c31014f7 ("malloc: allow adding memory to named heaps")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/rte_malloc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Thomas Monjalon Nov. 5, 2018, 10:21 p.m. UTC | #1 
05/11/2018 18:26, Anatoly Burakov:
> When adding memory to an external heap, do not go to unlock failure
> handler because the memory hotplug lock hasn't been taken out yet.
> 
> Fixes: 7d75c31014f7 ("malloc: allow adding memory to named heaps")
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
index 9e61dc41b..0da5ad5e8 100644
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -349,8 +349,7 @@  rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,
 			strnlen(heap_name, RTE_HEAP_NAME_MAX_LEN) ==
 				RTE_HEAP_NAME_MAX_LEN) {
 		rte_errno = EINVAL;
-		ret = -1;
-		goto unlock;
+		return -1;
 	}
 	rte_rwlock_write_lock(&mcfg->memory_hotplug_lock);