From patchwork Thu Nov 8 13:40:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Manoil X-Patchwork-Id: 197836 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 8FB5C2C0147 for ; Fri, 9 Nov 2012 00:40:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721Ab2KHNkS (ORCPT ); Thu, 8 Nov 2012 08:40:18 -0500 Received: from co1ehsobe006.messaging.microsoft.com ([216.32.180.189]:38000 "EHLO co1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab2KHNkQ (ORCPT ); Thu, 8 Nov 2012 08:40:16 -0500 Received: from mail74-co1-R.bigfish.com (10.243.78.252) by CO1EHSOBE016.bigfish.com (10.243.66.79) with Microsoft SMTP Server id 14.1.225.23; Thu, 8 Nov 2012 13:40:15 +0000 Received: from mail74-co1 (localhost [127.0.0.1]) by mail74-co1-R.bigfish.com (Postfix) with ESMTP id 94B81960290; Thu, 8 Nov 2012 13:40:15 +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 mail74-co1 (localhost.localdomain [127.0.0.1]) by mail74-co1 (MessageSwitch) id 1352382013799123_12590; Thu, 8 Nov 2012 13:40:13 +0000 (UTC) Received: from CO1EHSMHS023.bigfish.com (unknown [10.243.78.235]) by mail74-co1.bigfish.com (Postfix) with ESMTP id BEF4A1C00C8; Thu, 8 Nov 2012 13:40:13 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS023.bigfish.com (10.243.66.33) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 8 Nov 2012 13:40:13 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.318.3; Thu, 8 Nov 2012 13:40:12 +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 qA8De9YL010722; Thu, 8 Nov 2012 06:40:10 -0700 Received: by zro04cle141.ea.freescale.net (Postfix, from userid 23113) id B80004007F; Thu, 8 Nov 2012 15:40:08 +0200 (EET) From: Claudiu Manoil To: CC: Paul Gortmaker , "David S. Miller" , Claudiu Manoil Subject: [PATCH][net-next] gianfar: Fix alloc_skb_resources on -ENOMEM cleanup path Date: Thu, 8 Nov 2012 15:40:08 +0200 Message-ID: <1352382008-7039-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 --- drivers/net/ethernet/freescale/gianfar.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 1d03dcd..c5c82ad 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -311,7 +311,7 @@ static int gfar_alloc_skb_resources(struct net_device *ndev) } if (gfar_init_bds(ndev)) - goto cleanup; + return -ENOMEM; return 0; @@ -1356,7 +1356,9 @@ static int gfar_restore(struct device *dev) if (!netif_running(ndev)) return 0; - gfar_init_bds(ndev); + if (gfar_init_bds(ndev)) + return -ENOMEM; + init_registers(ndev); gfar_set_mac_address(ndev); gfar_init_mac(ndev); @@ -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.