[RFC v2 08/16] bus/fslmc: fix some VFIO device FD and memory leaks

[David Marchand]

In case VFIO_DEVICE_GET_INFO fails, the vfio_dev_fd was leaked.
In a similar way, failing to add this device FD in the group list would
result in leaking the FD.

When uninitialising a device or doing a bus cleanup, the per device VFIO
FD and the associated memory used for tracking it were leaked.

Fixes: 57cb02edf122 ("bus/fslmc: enhance MC VFIO multi-process support")

Signed-off-by: David Marchand <david.march...@redhat.com>
---
 drivers/bus/fslmc/fslmc_vfio.c | 45 ++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 6e0b35f391..705f5aeffc 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -205,13 +205,17 @@ static int
 fslmc_vfio_clear_group(int vfio_group_fd)
 {
        struct fslmc_vfio_group *group;
-       struct fslmc_vfio_device *dev;
        int clear = 0;
 
        LIST_FOREACH(group, &s_vfio_container.groups, next) {
                if (group->fd == vfio_group_fd) {
-                       LIST_FOREACH(dev, &group->vfio_devices, next)
+                       while (!LIST_EMPTY(&group->vfio_devices)) {
+                               struct fslmc_vfio_device *dev = 
LIST_FIRST(&group->vfio_devices);
+
+                               close(dev->fd);
                                LIST_REMOVE(dev, next);
+                               rte_free(dev);
+                       }
 
                        close(vfio_group_fd);
                        LIST_REMOVE(group, next);
@@ -311,6 +315,8 @@ fslmc_vfio_group_add_dev(int vfio_group_fd,
                if (group->fd == vfio_group_fd) {
                        dev = rte_zmalloc(NULL,
                                sizeof(struct fslmc_vfio_device), 0);
+                       if (dev == NULL)
+                               return -ENOMEM;
                        dev->fd = dev_fd;
                        rte_strscpy(dev->dev_name, name, sizeof(dev->dev_name));
                        LIST_INSERT_HEAD(&group->vfio_devices, dev, next);
@@ -326,26 +332,25 @@ fslmc_vfio_group_remove_dev(int vfio_group_fd,
 {
        struct fslmc_vfio_group *group = NULL;
        struct fslmc_vfio_device *dev;
-       int removed = 0;
 
        LIST_FOREACH(group, &s_vfio_container.groups, next) {
                if (group->fd == vfio_group_fd)
                        break;
        }
 
-       if (group) {
-               LIST_FOREACH(dev, &group->vfio_devices, next) {
-                       if (!strcmp(dev->dev_name, name)) {
-                               LIST_REMOVE(dev, next);
-                               removed = 1;
-                               break;
-                       }
+       if (group == NULL)
+               goto err;
+
+       LIST_FOREACH(dev, &group->vfio_devices, next) {
+               if (strcmp(dev->dev_name, name) == 0) {
+                       close(dev->fd);
+                       LIST_REMOVE(dev, next);
+                       rte_free(dev);
+                       return 0;
                }
        }
 
-       if (removed)
-               return 0;
-
+err:
        return -ENODEV;
 }
 
@@ -1240,11 +1245,21 @@ fslmc_vfio_setup_device(const char *dev_addr,
        if (ret) {
                DPAA2_BUS_ERR("%s cannot get device info err(%d)(%s)",
                        dev_addr, errno, strerror(errno));
+               close(*vfio_dev_fd);
+               *vfio_dev_fd = -1;
                return ret;
        }
 
-       return fslmc_vfio_group_add_dev(vfio_group_fd, *vfio_dev_fd,
-                       dev_addr);
+       ret = fslmc_vfio_group_add_dev(vfio_group_fd, *vfio_dev_fd, dev_addr);
+       if (ret) {
+               DPAA2_BUS_ERR("%s cannot add device in group err(%d)(%s)",
+                       dev_addr, ret, strerror(-ret));
+               close(*vfio_dev_fd);
+               *vfio_dev_fd = -1;
+               return ret;
+       }
+
+       return 0;
 }
 
 static intptr_t vfio_map_mcp_obj(const char *mcp_obj)
-- 
2.54.0