[dpdk-dev] [PATCH 3/6] eal: Fix memory leaks and needless incrementation of pci uio implementation

[Tetsuya Mukawa]

When pci_map_resource() is failed but path is allocated correctly,
path won't be freed. Also, when open() is failed, uio_res won't be freed.
This patch fixes these memory leaks.
When pci_map_resource() is failed, mapaddr will be MAP_FAILED.
In this case, pci_map_addr should not be incremented.

Also, the patch fixes belows.
 - To shrink code, move close().
 - Remove fail variable.

Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>
---
 lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c 
b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
index b971ec9..5044884 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -333,7 +333,6 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        maps = uio_res->maps;
        for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) {
                int fd;
-               int fail = 0;

                /* skip empty BAR */
                phaddr = dev->mem_resource[i].phys_addr;
@@ -347,6 +346,11 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                                loc->domain, loc->bus, loc->devid, 
loc->function,
                                i);

+               /* allocate memory to keep path */
+               maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0);
+               if (maps[map_idx].path == NULL)
+                       goto fail0;
+
                /*
                 * open resource file, to mmap it
                 */
@@ -354,7 +358,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                if (fd < 0) {
                        RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
                                        devname, strerror(errno));
-                       return -1;
+                       goto fail1;
                }

                /* try mapping somewhere close to the end of hugepages */
@@ -363,23 +367,13 @@ pci_uio_map_resource(struct rte_pci_device *dev)

                mapaddr = pci_map_resource(pci_map_addr, fd, 0,
                                (size_t)dev->mem_resource[i].len, 0);
+               close(fd);
                if (mapaddr == MAP_FAILED)
-                       fail = 1;
+                       goto fail1;

                pci_map_addr = RTE_PTR_ADD(mapaddr,
                                (size_t)dev->mem_resource[i].len);

-               maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0);
-               if (maps[map_idx].path == NULL)
-                       fail = 1;
-
-               if (fail) {
-                       rte_free(uio_res);
-                       close(fd);
-                       return -1;
-               }
-               close(fd);
-
                maps[map_idx].phaddr = dev->mem_resource[i].phys_addr;
                maps[map_idx].size = dev->mem_resource[i].len;
                maps[map_idx].addr = mapaddr;
@@ -394,6 +388,12 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);

        return 0;
+
+fail1:
+       rte_free(maps[map_idx].path);
+fail0:
+       rte_free(uio_res);
+       return -1;
 }

 #ifdef RTE_LIBRTE_EAL_HOTPLUG
-- 
1.9.1