[PATCH net-next] dpaa_eth: Fix one possible memleak in dpaa_eth_probe

[PATCH net-next] dpaa_eth: Fix one possible memleak in dpaa_eth_probe

[Liu Jian]

When dma_coerce_mask_and_coherent() fails, the alloced netdev need to be freed.

Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 2972244e6eb0..43570f4911ea 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2938,7 +2938,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
 						   DMA_BIT_MASK(40));
 	if (err) {
 		netdev_err(net_dev, "dma_coerce_mask_and_coherent() failed\n");
-		return err;
+		goto free_netdev;
 	}
 
 	/* If fsl_fm_max_frm is set to a higher value than the all-common 1500,
-- 
2.17.1

Re: [PATCH net-next] dpaa_eth: Fix one possible memleak in dpaa_eth_probe

[David Miller]

From: Liu Jian <liujian56@huawei.com>
Date: Fri, 17 Jul 2020 17:05:28 +0800

> When dma_coerce_mask_and_coherent() fails, the alloced netdev need to be freed.
> 
> Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
> Signed-off-by: Liu Jian <liujian56@huawei.com>

This is a bug fix introduced in v5.5, therefore it should be targetting
'net' instead of 'net-next'.

RE: [PATCH net-next] dpaa_eth: Fix one possible memleak in dpaa_eth_probe

[liujian (CE)]

> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Saturday, July 18, 2020 9:42 AM
> To: liujian (CE) <liujian56@huawei.com>
> Cc: madalin.bucur@nxp.com; kuba@kernel.org; laurentiu.tudor@nxp.com;
> netdev@vger.kernel.org
> Subject: Re: [PATCH net-next] dpaa_eth: Fix one possible memleak in
> dpaa_eth_probe
> 
> From: Liu Jian <liujian56@huawei.com>
> Date: Fri, 17 Jul 2020 17:05:28 +0800
> 
> > When dma_coerce_mask_and_coherent() fails, the alloced netdev need
> to be freed.
> >
> > Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
> > Signed-off-by: Liu Jian <liujian56@huawei.com>
> 
> This is a bug fix introduced in v5.5, therefore it should be targetting 'net'
> instead of 'net-next'.

Thank you David, I will send v2.