From patchwork Fri Jul 9 17:55:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58419 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6A8B9B6EF0 for ; Sat, 10 Jul 2010 03:55:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753585Ab0GIRzs (ORCPT ); Fri, 9 Jul 2010 13:55:48 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:65242 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753152Ab0GIRzr (ORCPT ); Fri, 9 Jul 2010 13:55:47 -0400 Received: by vws5 with SMTP id 5so2793160vws.19 for ; Fri, 09 Jul 2010 10:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=DKa2xa4427oRWbYbZHyVBs1yh41713HnHhMt4wwCyNs=; b=MzFNi4aFIvdl7MIrO+uqytTzgk3OX0pHHnOqtqjQWX9oKZWqSpoP6hCi5NiDAAX2zU HmOKDDZ8b+Dek9Z5ocZcX2trYHVEZEKUtktXkNko7i5IF7ApXtDP8qwFGkA6jOeF1eiZ l6u/Dfw2x5ke0uau9IO6y//B3p7rF07mYn/cQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=FRx2sQYI058FCBV+lYqACejM2FEZcLEL8dbHacRN5Fygf9r0RhNQ0a06H7BQjP7u8k 9lM1S/wTAffTpZsEi1TIUGJhjwVCuC2EINWbeWP22Q6bVbCHNNcGO8qF6V47WvawFACB 7UOFbKNVHhn6WjGIzH4e3QMvHa6JNRH9qwa18= Received: by 10.220.75.200 with SMTP id z8mr5427566vcj.197.1278698146577; Fri, 09 Jul 2010 10:55:46 -0700 (PDT) Received: from localhost ([213.87.81.195]) by mx.google.com with ESMTPS id m31sm1304685vcf.13.2010.07.09.10.55.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Jul 2010 10:55:45 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Denis Kirjanov , "David S. Miller" , John Linn , Grant Likely , Jiri Pirko , netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCH v3] ll_temac: fix DMA and memory leaks Date: Fri, 9 Jul 2010 21:55:13 +0400 Message-Id: <1278698113-5713-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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; }