| Message ID | 20191215011045.15453-1-navid.emamdoost@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f37f710353677639bc5d37ee785335994adf2529 |
| Headers | show |
| Series | net: gemini: Fix memory leak in gmac_setup_txqs | expand |
> +++ b/drivers/net/ethernet/cortina/gemini.c > @@ -576,6 +576,8 @@ static int gmac_setup_txqs(struct net_device *netdev) > > if (port->txq_dma_base & ~DMA_Q_BASE_MASK) { > dev_warn(geth->dev, "TX queue base is not aligned\n"); > + dma_free_coherent(geth->dev, len * sizeof(*desc_ring), > + desc_ring, port->txq_dma_base); > kfree(skb_tab); > return -ENOMEM; > } The added function call seems to be fine. Would you like to avoid a bit of duplicate code for the exception handling? Regards, Markus
On Sun, Dec 15, 2019 at 2:11 AM Navid Emamdoost <navid.emamdoost@gmail.com> wrote: > In the implementation of gmac_setup_txqs() the allocated desc_ring is > leaked if TX queue base is not aligned. Release it via > dma_free_coherent. > > Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Looks correct to me, Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Sat, 14 Dec 2019 19:10:44 -0600 > In the implementation of gmac_setup_txqs() the allocated desc_ring is > leaked if TX queue base is not aligned. Release it via > dma_free_coherent. > > Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index a8f4c69252ff..3a796fe099dd 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -576,6 +576,8 @@ static int gmac_setup_txqs(struct net_device *netdev) if (port->txq_dma_base & ~DMA_Q_BASE_MASK) { dev_warn(geth->dev, "TX queue base is not aligned\n"); + dma_free_coherent(geth->dev, len * sizeof(*desc_ring), + desc_ring, port->txq_dma_base); kfree(skb_tab); return -ENOMEM; }
In the implementation of gmac_setup_txqs() the allocated desc_ring is leaked if TX queue base is not aligned. Release it via dma_free_coherent. Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- drivers/net/ethernet/cortina/gemini.c | 2 ++ 1 file changed, 2 insertions(+)