[PATCH] RDMA/cxgb4: Fix memory leaks in c4iw_alloc() error paths

[PATCH] RDMA/cxgb4: Fix memory leaks in c4iw_alloc() error paths

[Christoph Jaeger]

c4iw_alloc() bails out without freeing the storage that 'devp' points to.

Picked up by Coverity - CID 1204241.

Fixes: fa658a98a2 ("RDMA/cxgb4: Use the BAR2/WC path for kernel QPs and T5 devices")
Signed-off-by: Christoph Jaeger <christophjaeger@linux.com>
---
 drivers/infiniband/hw/cxgb4/device.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index f4fa50a..8914ea9 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -736,6 +736,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
 			pci_resource_len(devp->rdev.lldi.pdev, 2));
 		if (!devp->rdev.bar2_kva) {
 			pr_err(MOD "Unable to ioremap BAR2\n");
+			ib_dealloc_device(&devp->ibdev);
 			return ERR_PTR(-EINVAL);
 		}
 	} else if (ocqp_supported(infop)) {
@@ -747,6 +748,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
 			devp->rdev.lldi.vr->ocq.size);
 		if (!devp->rdev.oc_mw_kva) {
 			pr_err(MOD "Unable to ioremap onchip mem\n");
+			ib_dealloc_device(&devp->ibdev);
 			return ERR_PTR(-EINVAL);
 		}
 	}
-- 
1.9.0

RE: [PATCH] RDMA/cxgb4: Fix memory leaks in c4iw_alloc() error paths

[Steve Wise]

> -----Original Message-----
> From: Christoph Jaeger [mailto:christophjaeger@linux.com]
> Sent: Monday, April 21, 2014 10:03 AM
> To: swise@chelsio.com; roland@kernel.org; sean.hefty@intel.com; hal.rosenstock@gmail.com
> Cc: linux-rdma@vger.kernel.org; linux-kernel@vger.kernel.org; Christoph Jaeger
> Subject: [PATCH] RDMA/cxgb4: Fix memory leaks in c4iw_alloc() error paths
> 
> c4iw_alloc() bails out without freeing the storage that 'devp' points to.
> 
> Picked up by Coverity - CID 1204241.
> 
> Fixes: fa658a98a2 ("RDMA/cxgb4: Use the BAR2/WC path for kernel QPs and T5 devices")
> Signed-off-by: Christoph Jaeger <christophjaeger@linux.com>

Acked-by: Steve Wise <swise@opengridcomputing.com>

thanks!