RDMA/hns: Fix memory leak on 'context' on error return path

BugLink: https://bugs.launchpad.net/bugs/1860490
[ Upstream commit 994195e1537074f56df216a9309f6e366cb35b67 ]

Currently, the error return path when the call to function
dev->dfx->query_cqc_info fails will leak object 'context'. Fix this by
making the error return path via 'err' return return codes rather than
-EMSGSIZE, set ret appropriately for all error return paths and for the
memory leak now return via 'err' rather than just returning without
freeing context.

Link: https://lore.kernel.org/r/20191024131034.19989-1-colin.king@canonical.com
Addresses-Coverity: ("Resource leak")
Fixes: e1c9a0dc2939 ("RDMA/hns: Dump detailed driver-specific CQ")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_restrack.c b/drivers/infiniband/hw/hns/hns_roce_restrack.c
index 0a31d0a3d657c076861d9fcb260f9f45c788a117..06871731ac43a72bde2c9df27ddde99740809732 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_restrack.c
+++ b/drivers/infiniband/hw/hns/hns_roce_restrack.c
@@ -98,11 +98,15 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
                goto err;
 
        table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);
-       if (!table_attr)
+       if (!table_attr) {
+               ret = -EMSGSIZE;
                goto err;
+       }
 
-       if (hns_roce_fill_cq(msg, context))
+       if (hns_roce_fill_cq(msg, context)) {
+               ret = -EMSGSIZE;
                goto err_cancel_table;
+       }
 
        nla_nest_end(msg, table_attr);
        kfree(context);
@@ -113,7 +117,7 @@ err_cancel_table:
        nla_nest_cancel(msg, table_attr);
 err:
        kfree(context);
-       return -EMSGSIZE;
+       return ret;
 }
 
 int hns_roce_fill_res_entry(struct sk_buff *msg,