From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Subject: [PATCH 3/4 v3] ll_temac: fix DMA and memory leaks Date: Sat, 10 Jul 2010 11:30:07 +0400 Message-ID: <20100710073006.GA4339@albatros> References: <1278591012-3213-1-git-send-email-segooon@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Kernel Janitors , "David S. Miller" , John Linn , Grant Likely , Jiri Pirko , Brian Hill , netdev@vger.kernel.org To: dkirjanov@kernel.org Return-path: Received: from mail-qw0-f46.google.com ([209.85.216.46]:36844 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751992Ab0GJHcF (ORCPT ); Sat, 10 Jul 2010 03:32:05 -0400 Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: temac_dma_bd_init() doesn't free DMA and memory on error. Also temac_stop() must free them. Signed-off-by: Denis Kirjanov Signed-off-by: Kulikov Vasiliy --- drivers/net/ll_temac_main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 5bca20b..9090e79 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -193,6 +193,41 @@ static int temac_dcr_setup(struct temac_local *lp, struct of_device *op, #endif /** + * * temac_dma_bd_release - Release buffer descriptor rings + */ +static void temac_dma_bd_release(struct net_device *ndev) +{ + struct temac_local *lp = netdev_priv(ndev); + int i; + + if (lp->rx_skb) { + for (i = 0; i < RX_BD_NUM; i++) { + if (!lp->rx_skb[i]) + break; + dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys, + XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); + dev_kfree_skb(lp->rx_skb[i]); + } + kfree(lp->rx_skb); + lp->rx_skb = NULL; + } + + if (lp->rx_bd_v) { + dma_free_coherent(ndev->dev.parent, + sizeof(*lp->rx_bd_v) * RX_BD_NUM, + lp->rx_bd_v, lp->rx_bd_p); + lp->rx_bd_v = NULL; + } + + if (lp->tx_bd_v) { + dma_free_coherent(ndev->dev.parent, + sizeof(*lp->tx_bd_v) * TX_BD_NUM, + lp->tx_bd_v, lp->tx_bd_p); + lp->tx_bd_v = NULL; + } +} + +/** * temac_dma_bd_init - Setup buffer descriptor rings */ static int temac_dma_bd_init(struct net_device *ndev) @@ -275,6 +310,7 @@ static int temac_dma_bd_init(struct net_device *ndev) return 0; out: + temac_dma_bd_release(ndev); return -ENOMEM; } @@ -858,6 +894,8 @@ static int temac_stop(struct net_device *ndev) phy_disconnect(lp->phy_dev); lp->phy_dev = NULL; + temac_dma_bd_release(ndev); + return 0; } -- 1.7.0.4