IB/hfi1: Handle kzalloc failure in init_pervl_scs

Checking the return value of the memory allocation call in
init_pervl_scs() was missed.  Recently the kmalloc() was changed to
kzalloc() which identified the problem.

While fixing this issue 2 other bugs were noticed.  First, the array
being allocated is accessed in the nomem path which can be reached before
it is allocated.  Second, kernel_send_context was not released on error.
Fix both of these by creating a more common memory unwind label structure.

Fixes: 35f6befc8441 ("staging/rdma/hfi1: Add qp to send context mapping for PIO")
Reported-by: Leon Romanovsky <leon@kernel.org>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index a99fccadf6247b5408dce945965a91c59ad1e381..ac1bf4a73571ff72d1612644618c14403611d585 100644 (file)
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -1952,13 +1952,17 @@ int init_pervl_scs(struct hfi1_devdata *dd)
        dd->vld[15].sc = sc_alloc(dd, SC_VL15,
                                  dd->rcd[0]->rcvhdrqentsize, dd->node);
        if (!dd->vld[15].sc)
-               goto nomem;
+               return -ENOMEM;
+
        hfi1_init_ctxt(dd->vld[15].sc);
        dd->vld[15].mtu = enum_to_mtu(OPA_MTU_2048);
 
        dd->kernel_send_context = kzalloc_node(dd->num_send_contexts *
                                        sizeof(struct send_context *),
                                        GFP_KERNEL, dd->node);
+       if (!dd->kernel_send_context)
+               goto freesc15;
+
        dd->kernel_send_context[0] = dd->vld[15].sc;
 
        for (i = 0; i < num_vls; i++) {
@@ -2010,12 +2014,21 @@ int init_pervl_scs(struct hfi1_devdata *dd)
        if (pio_map_init(dd, ppd->port - 1, num_vls, NULL))
                goto nomem;
        return 0;
+
 nomem:
-       sc_free(dd->vld[15].sc);
-       for (i = 0; i < num_vls; i++)
+       for (i = 0; i < num_vls; i++) {
                sc_free(dd->vld[i].sc);
+               dd->vld[i].sc = NULL;
+       }
+
        for (i = num_vls; i < INIT_SC_PER_VL * num_vls; i++)
                sc_free(dd->kernel_send_context[i + 1]);
+
+       kfree(dd->kernel_send_context);
+       dd->kernel_send_context = NULL;
+
+freesc15:
+       sc_free(dd->vld[15].sc);
        return -ENOMEM;
 }