Unverified Commit b15aafa9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5767 v5 net: fec: fix the potential memory leak in fec_enet_init() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Zekun <zhangzekun11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MSZNVV6HMY2PCDQIJMZSSY35UVBB4XVK/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9BGVY 
 
Link:https://gitee.com/openeuler/kernel/pulls/5767

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 21f8f50c 34137c8b

drivers/net/ethernet/freescale/fec_main.c

+9 −2
Original line number Diff line number Diff line
@@ -3147,7 +3147,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;
@@ -3155,7 +3157,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);
@@ -3235,6 +3238,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