From d8f7942cdc53e4af192760820a0d087cdfdd280f Mon Sep 17 00:00:00 2001

From: Fugang Duan <fugang.duan@nxp.com>

Date: Wed, 12 May 2021 10:43:59 +0800

Subject: [PATCH 04/16] net: fec: fix the potential memory leak in

 fec_enet_init()

Git-commit: 619fee9eb13b5d29e4267cb394645608088c28a8

Patch-mainline: v5.13-rc4

References: git-fixes

If the memory allocated for cbd_base is failed, it should

free the memory allocated for the queues, otherwise it causes

memory leak.

And if the memory allocated for the queues is failed, it can

return error directly.

Fixes: 59d0f7465644 ("net: fec: init multi queue date structure")

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/ethernet/freescale/fec_main.c | 11 +++++++++--

 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c

index 70a5039faa89..fa0a9df96ba0 100644

--- a/drivers/net/ethernet/freescale/fec_main.c

+++ b/drivers/net/ethernet/freescale/fec_main.c

@@ -3175,7 +3175,9 @@ static int fec_enet_init(struct net_device *ndev)

 		return ret;

 	}

-	fec_enet_alloc_queue(ndev);

+	ret = fec_enet_alloc_queue(ndev);

+	if (ret)

+		return ret;

 	bd_size = (fep->total_tx_ring_size + fep->total_rx_ring_size) * dsize;

@@ -3183,7 +3185,8 @@ static int fec_enet_init(struct net_device *ndev)

 	cbd_base = dmam_alloc_coherent(&fep->pdev->dev, bd_size, &bd_dma,

 				       GFP_KERNEL);

 	if (!cbd_base) {

-		return -ENOMEM;

+		ret = -ENOMEM;

+		goto free_queue_mem;

 	}

 	memset(cbd_base, 0, bd_size);

@@ -3260,6 +3263,10 @@ static int fec_enet_init(struct net_device *ndev)

 	fec_enet_update_ethtool_stats(ndev);

 	return 0;

+

+free_queue_mem:

+	fec_enet_free_queue(ndev);

+	return ret;

 }

 #ifdef CONFIG_OF

-- 

2.16.4