| Message ID | 20200720142829.40067-1-liujian56@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,net] dpaa_eth: Fix one possible memleak in dpaa_eth_probe | expand |
> -----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>
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.
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,
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(-)