* [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe
@ 2020-07-20 14:28 Liu Jian
2020-07-20 17:43 ` Madalin Bucur (OSS)
2020-07-21 0:54 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Liu Jian @ 2020-07-20 14:28 UTC (permalink / raw)
To: madalin.bucur, davem, kuba, laurentiu.tudor, netdev
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>
---
v1->v2:
Change targeting from "net-next" to "net"
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe
2020-07-20 14:28 [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe Liu Jian
@ 2020-07-20 17:43 ` Madalin Bucur (OSS)
2020-07-21 0:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Madalin Bucur (OSS) @ 2020-07-20 17:43 UTC (permalink / raw)
To: Liu Jian, davem, kuba, Laurentiu Tudor, netdev
> -----Original Message-----
> From: Liu Jian <liujian56@huawei.com>
> Sent: Monday, July 20, 2020 5:28 PM
> To: Madalin Bucur <madalin.bucur@nxp.com>; davem@davemloft.net;
> kuba@kernel.org; Laurentiu Tudor <laurentiu.tudor@nxp.com>;
> netdev@vger.kernel.org
> Subject: [PATCH v2 net] dpaa_eth: Fix one possible memleak in
> dpaa_eth_probe
>
> 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>
> ---
>
> v1->v2:
> Change targeting from "net-next" to "net"
>
> 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
Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe
2020-07-20 14:28 [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe Liu Jian
2020-07-20 17:43 ` Madalin Bucur (OSS)
@ 2020-07-21 0:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-07-21 0:54 UTC (permalink / raw)
To: liujian56; +Cc: madalin.bucur, kuba, laurentiu.tudor, netdev
From: Liu Jian <liujian56@huawei.com>
Date: Mon, 20 Jul 2020 22:28:29 +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>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-21 0:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 14:28 [PATCH v2 net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe Liu Jian
2020-07-20 17:43 ` Madalin Bucur (OSS)
2020-07-21 0:54 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.