Fix issue reported by Coverity.
Coverity ID 13295, 13296, 13303:
Resource leak: The system resource will not be reclaimed
and reused, reducing the future availability of the resource.
In rte_eal_hugepage_attach: Leak of memory or pointers to system
resources.
Fixes: af75078fece3 ("first public release")
Signed-off-by: Marcin Kerlin <marcinx.kerlin at intel.com>
---
lib/librte_eal/linuxapp/eal/eal_memory.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c
b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 5b9132c..6320aa0 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1475,13 +1475,17 @@ rte_eal_hugepage_attach(void)
"and retry running both primary "
"and secondary processes\n");
}
+
+ if (base_addr != MAP_FAILED)
+ munmap((void *)(uintptr_t)base_addr,
mcfg->memseg[s].len);
+
goto error;
}
}
size = getFileSize(fd_hugepage);
hp = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd_hugepage, 0);
- if (hp == NULL) {
+ if (hp == MAP_FAILED) {
RTE_LOG(ERR, EAL, "Could not mmap %s\n",
eal_hugepage_info_path());
goto error;
}
@@ -1535,6 +1539,10 @@ rte_eal_hugepage_attach(void)
addr != RTE_PTR_ADD(base_addr,
offset)) {
RTE_LOG(ERR, EAL, "Could not mmap %s\n",
hp[i].filepath);
+
+ if (addr != MAP_FAILED)
+ munmap((void *)(uintptr_t)addr,
mapping_size);
+
goto error;
}
offset+=mapping_size;
@@ -1551,6 +1559,8 @@ rte_eal_hugepage_attach(void)
return 0;
error:
+ if (hp != NULL && hp != MAP_FAILED)
+ munmap((void *) (uintptr_t) hp, size);
if (fd_zero >= 0)
close(fd_zero);
if (fd_hugepage >= 0)
--
1.9.1
