From patchwork Thu Nov 8 15:59:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Manoil X-Patchwork-Id: 197854 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 14E942C0147 for ; Fri, 9 Nov 2012 03:15:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756278Ab2KHQPL (ORCPT ); Thu, 8 Nov 2012 11:15:11 -0500 Received: from co9ehsobe001.messaging.microsoft.com ([207.46.163.24]:52068 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756270Ab2KHQPJ (ORCPT ); Thu, 8 Nov 2012 11:15:09 -0500 X-Greylist: delayed 902 seconds by postgrey-1.27 at vger.kernel.org; Thu, 08 Nov 2012 11:15:09 EST Received: from mail201-co9-R.bigfish.com (10.236.132.235) by CO9EHSOBE001.bigfish.com (10.236.130.64) with Microsoft SMTP Server id 14.1.225.23; Thu, 8 Nov 2012 16:00:06 +0000 Received: from mail201-co9 (localhost [127.0.0.1]) by mail201-co9-R.bigfish.com (Postfix) with ESMTP id B3B603C0111; Thu, 8 Nov 2012 16:00:06 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275ch8275bhz2dh2a8h668h839hd24he5bhf0ah107ah11b5h121eh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14afh1504h1537h1155h) Received: from mail201-co9 (localhost.localdomain [127.0.0.1]) by mail201-co9 (MessageSwitch) id 1352390404652747_16461; Thu, 8 Nov 2012 16:00:04 +0000 (UTC) Received: from CO9EHSMHS001.bigfish.com (unknown [10.236.132.252]) by mail201-co9.bigfish.com (Postfix) with ESMTP id 8788880049; Thu, 8 Nov 2012 16:00:04 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS001.bigfish.com (10.236.130.11) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 8 Nov 2012 16:00:04 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.318.3; Thu, 8 Nov 2012 16:00:03 +0000 Received: from zro04cle141.ea.freescale.net (udp157456uds.ea.freescale.net [140.101.223.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qA8FxvBQ004478; Thu, 8 Nov 2012 09:00:02 -0700 Received: by zro04cle141.ea.freescale.net (Postfix, from userid 23113) id AB1114007F; Thu, 8 Nov 2012 17:59:56 +0200 (EET) From: Claudiu Manoil To: CC: Paul Gortmaker , "David S. Miller" , Claudiu Manoil Subject: [PATCH][net-next v1] gianfar: Fix alloc_skb_resources on -ENOMEM cleanup path Date: Thu, 8 Nov 2012 17:59:56 +0200 Message-ID: <1352390396-10053-1-git-send-email-claudiu.manoil@freescale.com> X-Mailer: git-send-email 1.6.6 MIME-Version: 1.0 X-OriginatorOrg: freescale.net Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Should gfar_init_bds() return with -ENOMEM inside gfar_alloc_skb_resources(), free_skb_resources() will be called twice in a row on the "cleanup" path, leading to duplicate kfree() calls for rx_|tx_queue->rx_|tx_skbuff resulting in segmentation fault. This patch prevents the segmentation fault to happen in the future (rx_|tx_sbkbuff set to NULL), and corrects the error path handling for gfar_init_bds(). Cc: Paul Gortmaker Cc: "David S. Miller" Signed-off-by: Claudiu Manoil --- v1: do free_skb_resources() on the cleanup path of gfar_init_bds()'s parent drivers/net/ethernet/freescale/gianfar.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 1d03dcd..ce2007f 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -210,7 +210,7 @@ static int gfar_init_bds(struct net_device *ndev) skb = gfar_new_skb(ndev); if (!skb) { netdev_err(ndev, "Can't allocate RX buffers\n"); - goto err_rxalloc_fail; + return -ENOMEM; } rx_queue->rx_skbuff[j] = skb; @@ -223,10 +223,6 @@ static int gfar_init_bds(struct net_device *ndev) } return 0; - -err_rxalloc_fail: - free_skb_resources(priv); - return -ENOMEM; } static int gfar_alloc_skb_resources(struct net_device *ndev) @@ -1356,7 +1352,9 @@ static int gfar_restore(struct device *dev) if (!netif_running(ndev)) return 0; - gfar_init_bds(ndev); + if (gfar_init_bds(ndev)) + goto cleanup; + init_registers(ndev); gfar_set_mac_address(ndev); gfar_init_mac(ndev); @@ -1373,6 +1371,10 @@ static int gfar_restore(struct device *dev) enable_napi(priv); return 0; + +cleanup: + free_skb_resources(priv); + return -ENOMEM; } static struct dev_pm_ops gfar_pm_ops = { @@ -1709,6 +1711,7 @@ static void free_skb_tx_queue(struct gfar_priv_tx_q *tx_queue) tx_queue->tx_skbuff[i] = NULL; } kfree(tx_queue->tx_skbuff); + tx_queue->tx_skbuff = NULL; } static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue) @@ -1732,6 +1735,7 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue) rxbdp++; } kfree(rx_queue->rx_skbuff); + rx_queue->rx_skbuff = NULL; } /* If there are any tx skbs or rx skbs still around, free them.