staging/rdma/hfi1: fix sdma build failures to always clean up

There are holes in the sdma build support routines that do
not clean any partially built sdma descriptors after mapping or
allocate failures.

This patch corrects these issues.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index 0710e2ab767c605ea844dbc1ee1b9c5ed18a59ae..9a15f1f32b45d5dbdea1d446e287dbf1bf2a36de 100644 (file)
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -2731,22 +2731,21 @@ static int _extend_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)
                        tx->coalesce_buf = kmalloc(tx->tlen + sizeof(u32),
                                                   GFP_ATOMIC);
                        if (!tx->coalesce_buf)
-                               return -ENOMEM;
-
+                               goto enomem;
                        tx->coalesce_idx = 0;
                }
                return 0;
        }
 
        if (unlikely(tx->num_desc == MAX_DESC))
-               return -ENOMEM;
+               goto enomem;
 
        tx->descp = kmalloc_array(
                        MAX_DESC,
                        sizeof(struct sdma_desc),
                        GFP_ATOMIC);
        if (!tx->descp)
-               return -ENOMEM;
+               goto enomem;
 
        /* reserve last descriptor for coalescing */
        tx->desc_limit = MAX_DESC - 1;
@@ -2754,6 +2753,9 @@ static int _extend_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)
        for (i = 0; i < tx->num_desc; i++)
                tx->descp[i] = tx->descs[i];
        return 0;
+enomem:
+       sdma_txclean(dd, tx);
+       return -ENOMEM;
 }
 
 /*

diff --git a/drivers/staging/rdma/hfi1/sdma.h b/drivers/staging/rdma/hfi1/sdma.h
index 85701eed15858993670cad0c1d47ecc889201cad..da89e6458162445d0cd1ec5fcfb048ea75a75991 100644 (file)
--- a/drivers/staging/rdma/hfi1/sdma.h
+++ b/drivers/staging/rdma/hfi1/sdma.h
@@ -774,10 +774,13 @@ static inline int _sdma_txadd_daddr(
        tx->tlen -= len;
        /* special cases for last */
        if (!tx->tlen) {
-               if (tx->packet_len & (sizeof(u32) - 1))
+               if (tx->packet_len & (sizeof(u32) - 1)) {
                        rval = _pad_sdma_tx_descs(dd, tx);
-               else
+                       if (rval)
+                               return rval;
+               } else {
                        _sdma_close_tx(dd, tx);
+               }
        }
        tx->num_desc++;
        return rval;