Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752649AbdGJGWQ (ORCPT ); Mon, 10 Jul 2017 02:22:16 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:52537 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752276AbdGJGWO (ORCPT ); Mon, 10 Jul 2017 02:22:14 -0400 Subject: Re: [PATCH 2/3] net: stmmac: Fix error handling path in 'alloc_dma_tx_desc_resources()' To: Christophe JAILLET , References: <41bce9018e1acec009ed184ba238f495a678297e.1499499451.git.christophe.jaillet@wanadoo.fr> CC: , , From: Giuseppe CAVALLARO Message-ID: Date: Mon, 10 Jul 2017 08:22:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <41bce9018e1acec009ed184ba238f495a678297e.1499499451.git.christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG8NODE3.st.com (10.75.127.24) To SFHDAG4NODE1.st.com (10.75.127.10) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-07-10_03:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1115 Lines: 25 On 7/8/2017 9:46 AM, Christophe JAILLET wrote: > If the first 'kmalloc_array' within the loop fails, we should free what > as already been allocated, as done in all other error handling path. > > Fixes: ce736788e8a9 ("net: stmmac: adding multiple buffers for TX") > Signed-off-by: Christophe JAILLET Acked-by: Giuseppe Cavallaro > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 4322fa4a13e8..07d486a70118 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -1561,7 +1561,7 @@ static int alloc_dma_tx_desc_resources(struct stmmac_priv *priv) > sizeof(*tx_q->tx_skbuff_dma), > GFP_KERNEL); > if (!tx_q->tx_skbuff_dma) > - return -ENOMEM; > + goto err_dma_buffers; > > tx_q->tx_skbuff = kmalloc_array(DMA_TX_SIZE, > sizeof(struct sk_buff *),