From patchwork Thu Jan 15 01:43:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Kukjin Kim' X-Patchwork-Id: 429172 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 DC9C0140192 for ; Thu, 15 Jan 2015 12:43:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751823AbbAOBnJ (ORCPT ); Wed, 14 Jan 2015 20:43:09 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:27175 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841AbbAOBnI (ORCPT ); Wed, 14 Jan 2015 20:43:08 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NI700FYE3FVVB60@mailout4.samsung.com> for netdev@vger.kernel.org; Thu, 15 Jan 2015 10:43:07 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-a5-54b71b2b2a55 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 37.38.09430.B2B17B45; Thu, 15 Jan 2015 10:43:07 +0900 (KST) Received: from kindness.dsn.sec.samsung.com ([12.36.165.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NI700IS13FS3740@mmp2.samsung.com>; Thu, 15 Jan 2015 10:43:06 +0900 (KST) From: Kukjin Kim To: netdev@vger.kernel.org Cc: Dave Miller , Dan Carpenter , Byungho An , Kukjin Kim Subject: [PATCH] [PATCH] net: sxgbe: Fix waring for double kfree() Date: Thu, 15 Jan 2015 10:43:11 +0900 Message-id: <1421286191-9550-1-git-send-email-kgene@kernel.org> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPJMWRmVeSWpSXmKPExsVy+t9jQV1t6e0hBjemcVtcPXeM0eL1v+ks Fove6Fr0P37NbHFsgZgDq0fLxg9sHptWdbJ5fHx6i8Wjb8sqRo/Pm+QCWKO4bFJSczLLUov0 7RK4MubeusNesJq/ov3AHLYGxjc8XYwcHBICJhKX+yK7GDmBTDGJC/fWs3UxcnEICUxnlFgy vYcJwulhktj68RszSAObgLJEY5M+SIOIgJTExx3b2UFqmAUmMko8WnOHFSQhLOAkcf32BBYQ m0VAVeLUtWVgcV4Be4l3byewQWxTkDg29SvrBEbuBYwMqxhFUwuSC4qT0nON9IoTc4tL89L1 kvNzNzGCg+GZ9A7GVQ0WhxgFOBiVeHgdjmwNEWJNLCuuzD3EKMHBrCTC+/bTthAh3pTEyqrU ovz4otKc1OJDjNIcLErivEr2bSFCAumJJanZqakFqUUwWSYOTqkGxhatzinqfo9NH6gli1it sJnofnNPxvoYx3jxrA1zBLzSI9fIBK9X/33FWfT3lxep5sonlsS62LI0CJzlULt8T/ViHdPy w4Z33NJYVCeUlUZ0Py6ZHnr35KaPf57UlDZ9Vcp8L/Cyd0/kS1E91k2XJCO+Gz5m5Gjptthu 5PbZ85CBwtk6dvZ7SizFGYmGWsxFxYkA6uRsNgICAAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Byungho An This patch fixes double kfree() calls at init_rx_ring() because it causes static checker warning. Reported-by: Dan Carpenter Signed-off-by: Byungho An Signed-off-by: Kukjin Kim --- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 6984944..fe7538d 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -474,13 +474,19 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no, /* allocate memory for RX skbuff array */ rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize, sizeof(dma_addr_t), GFP_KERNEL); - if (rx_ring->rx_skbuff_dma == NULL) - goto dmamem_err; + if (!rx_ring->rx_skbuff_dma) { + dma_free_coherent(priv->device, + rx_rsize * sizeof(struct sxgbe_rx_norm_desc), + rx_ring->dma_rx, rx_ring->dma_rx_phy); + goto error; + } rx_ring->rx_skbuff = kmalloc_array(rx_rsize, sizeof(struct sk_buff *), GFP_KERNEL); - if (rx_ring->rx_skbuff == NULL) - goto rxbuff_err; + if (!rx_ring->rx_skbuff) { + kfree(rx_ring->rx_skbuff_dma); + goto error; + } /* initialise the buffers */ for (desc_index = 0; desc_index < rx_rsize; desc_index++) { @@ -502,13 +508,6 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no, err_init_rx_buffers: while (--desc_index >= 0) free_rx_ring(priv->device, rx_ring, desc_index); - kfree(rx_ring->rx_skbuff); -rxbuff_err: - kfree(rx_ring->rx_skbuff_dma); -dmamem_err: - dma_free_coherent(priv->device, - rx_rsize * sizeof(struct sxgbe_rx_norm_desc), - rx_ring->dma_rx, rx_ring->dma_rx_phy); error: return -ENOMEM; }