From patchwork Fri Jun 20 12:12:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 362198 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 01E69140084 for ; Fri, 20 Jun 2014 22:12:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967355AbaFTMMr (ORCPT ); Fri, 20 Jun 2014 08:12:47 -0400 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:36350 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S967259AbaFTMMq (ORCPT ); Fri, 20 Jun 2014 08:12:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora; h=Date:Sender:Message-Id:Subject:Cc:To:From:References:In-Reply-To; bh=xT2w46+z8bRr1Qcjtfi5gadJOv6FV+aoxFyKIQi5pr0=; b=flYsNDMMLK/6Zu8mbjSdLmS/9ExfEbPSmcFfu0+ekllvznIp8X31zLaq5RWyCBjd1jnArIuI/cPFy1r4MB2Tq8JMxH8rEQ4r0G5BjcOiMOamE5s4gINNlFvV+1hV7JUnpo9ey6XNErgNMQ+UgD6MG5tfCmf9pO7wOAoFJq6DkD8=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:35102 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1WxxgS-0001D4-RR; Fri, 20 Jun 2014 13:12:44 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1WxxgS-0005Xb-GM; Fri, 20 Jun 2014 13:12:44 +0100 In-Reply-To: <20140620121118.GR32514@n2100.arm.linux.org.uk> References: <20140620121118.GR32514@n2100.arm.linux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Cc: Fugang Duan , netdev@vger.kernel.org Subject: [PATCH RFC 12/30] net: fec: ensure fec_enet_free_buffers() properly cleans the rings Message-Id: Date: Fri, 20 Jun 2014 13:12:44 +0100 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Ensure that we do not double-free any allocations, and that any transmit skbuffs are properly freed when we clean up the rings. Signed-off-by: Russell King --- drivers/net/ethernet/freescale/fec_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 9c5570a3e32e..8024b7a8e7f4 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2079,8 +2079,14 @@ static void fec_enet_free_buffers(struct net_device *ndev) } bdp = fep->tx_bd_base; - for (i = 0; i < fep->tx_ring_size; i++) + for (i = 0; i < fep->tx_ring_size; i++) { kfree(fep->tx_bounce[i]); + fep->tx_bounce[i] = NULL; + skb = fep->tx_skbuff[i]; + fep->tx_skbuff[i] = NULL; + if (skb) + dev_kfree_skb(skb); + } } static int fec_enet_alloc_buffers(struct net_device *ndev)