From: Maninder Singh <maninder1.s@samsung.com>
To: dledford@redhat.com, sean.hefty@intel.com, hal.rosenstock@gmail.com,
        ogerlitz@mellanox.com, davem@davemloft.net, roland@purestorage.com,
        matanb@mellanox.com, monis@mellanox.com, jackm@dev.mellanox.co.il,
        yishaih@mellanox.com, eranbe@mellanox.com, linux-rdma@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc: pankaj.m@samsung.com, Maninder Singh <maninder1.s@samsung.com>
Subject: [PATCH v2] infiniband: free only allocated items
Date: Wed, 08 Jul 2015 09:43:35 +0530
Message-id: <1436328815-28072-1-git-send-email-maninder1.s@samsung.com>
DLP-Filter: Pass
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1300
Lines: 41

 o If allocation of dm fails, no need to free it.
 o Free only allocated items.

Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
---
 drivers/infiniband/hw/mlx4/main.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 067a691..253498f 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2669,17 +2669,15 @@ static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init)
 	dm = kcalloc(ports, sizeof(*dm), GFP_ATOMIC);
 	if (!dm) {
 		pr_err("failed to allocate memory for tunneling qp update\n");
-		goto out;
+		return;
 	}
 
 	for (i = 0; i < ports; i++) {
 		dm[i] = kmalloc(sizeof (struct mlx4_ib_demux_work), GFP_ATOMIC);
 		if (!dm[i]) {
 			pr_err("failed to allocate memory for tunneling qp update work struct\n");
-			for (i = 0; i < dev->caps.num_ports; i++) {
-				if (dm[i])
-					kfree(dm[i]);
-			}
+			while (--i >= 0)
+				kfree(dm[i]);
 			goto out;
 		}
 	}
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/