[PATCH 4.9 001/130] IB/core: Release allocated memory in cache setup failure

[Greg Kroah-Hartman]

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Leon Romanovsky <l...@kernel.org>

commit aa6aae38f7fb2c030f326a6dd10b58fff1851dfa upstream.

The failure in ib_cache_setup_one function during
ib_register_device will leave leaked allocated memory.

Fixes: 03db3a2d81e6 ("IB/core: Add RoCE GID table management")
Signed-off-by: Leon Romanovsky <l...@kernel.org>
Signed-off-by: Doug Ledford <dledf...@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/infiniband/core/cache.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -770,12 +770,8 @@ static int _gid_table_setup_one(struct i
        int err = 0;
 
        table = kcalloc(ib_dev->phys_port_cnt, sizeof(*table), GFP_KERNEL);
-
-       if (!table) {
-               pr_warn("failed to allocate ib gid cache for %s\n",
-                       ib_dev->name);
+       if (!table)
                return -ENOMEM;
-       }
 
        for (port = 0; port < ib_dev->phys_port_cnt; port++) {
                u8 rdma_port = port + rdma_start_port(ib_dev);
@@ -1170,14 +1166,13 @@ int ib_cache_setup_one(struct ib_device
                                          GFP_KERNEL);
        if (!device->cache.pkey_cache ||
            !device->cache.lmc_cache) {
-               pr_warn("Couldn't allocate cache for %s\n", device->name);
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto free;
        }
 
        err = gid_table_setup_one(device);
        if (err)
-               /* Allocated memory will be cleaned in the release function */
-               return err;
+               goto free;
 
        for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p)
                ib_cache_update(device, p + rdma_start_port(device));
@@ -1192,6 +1187,9 @@ int ib_cache_setup_one(struct ib_device
 
 err:
        gid_table_cleanup_one(device);
+free:
+       kfree(device->cache.pkey_cache);
+       kfree(device->cache.lmc_cache);
        return err;
 }