IB/hfi1: Fix resource release in context allocation

Correct resource free in allocate_ctxt() function.
When context creation fails allocated resources are properly
released and pointer in receive context data table is set back
to NULL.

Reviewed-by: Dean Luick <dean.luick@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jakub Pawlak <jakub.pawlak@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index 335796f1f61593ebcb6f037784309d89d8b2dfd9..13bb6a5e4d373601e4b9403294b9196a03ed0415 100644 (file)
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -978,14 +978,16 @@ static int allocate_ctxt(struct file *fp, struct hfi1_devdata *dd,
         */
        uctxt->sc = sc_alloc(dd, SC_USER, uctxt->rcvhdrqentsize,
                             uctxt->dd->node);
-       if (!uctxt->sc)
-               return -ENOMEM;
-
+       if (!uctxt->sc) {
+               ret = -ENOMEM;
+               goto ctxdata_free;
+       }
        hfi1_cdbg(PROC, "allocated send context %u(%u)\n", uctxt->sc->sw_index,
                  uctxt->sc->hw_context);
        ret = sc_enable(uctxt->sc);
        if (ret)
-               return ret;
+               goto ctxdata_free;
+
        /*
         * Setup shared context resources if the user-level has requested
         * shared contexts and this is the 'master' process.
@@ -999,7 +1001,7 @@ static int allocate_ctxt(struct file *fp, struct hfi1_devdata *dd,
                 * send context because it will be done during file close
                 */
                if (ret)
-                       return ret;
+                       goto ctxdata_free;
        }
        uctxt->userversion = uinfo->userversion;
        uctxt->flags = hfi1_cap_mask; /* save current flag state */
@@ -1019,6 +1021,11 @@ static int allocate_ctxt(struct file *fp, struct hfi1_devdata *dd,
        fd->uctxt = uctxt;
 
        return 0;
+
+ctxdata_free:
+       dd->rcd[ctxt] = NULL;
+       hfi1_free_ctxtdata(dd, uctxt);
+       return ret;
 }
 
 static int init_subctxts(struct hfi1_ctxtdata *uctxt,

diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index ab2f2217d7b93f41302b45d1b37f074f611413ee..60db61536fedf396c7a76dcdf777f7000a189eec 100644 (file)
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -336,6 +336,7 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt,
        }
        return rcd;
 bail:
+       dd->rcd[ctxt] = NULL;
        kfree(rcd->egrbufs.rcvtids);
        kfree(rcd->egrbufs.buffers);
        kfree(rcd);