From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751056AbXACSoG (ORCPT ); Wed, 3 Jan 2007 13:44:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751064AbXACSoF (ORCPT ); Wed, 3 Jan 2007 13:44:05 -0500 Received: from emulex.emulex.com ([138.239.112.1]:46657 "EHLO emulex.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751056AbXACSoC (ORCPT ); Wed, 3 Jan 2007 13:44:02 -0500 X-Greylist: delayed 1612 seconds by postgrey-1.27 at vger.kernel.org; Wed, 03 Jan 2007 13:43:57 EST Message-ID: <459BF319.8060602@emulex.com> Date: Wed, 03 Jan 2007 13:16:57 -0500 From: James Smart Reply-To: James.Smart@Emulex.Com User-Agent: Thunderbird 1.5.0.9 (Windows/20061207) MIME-Version: 1.0 To: Mariusz Kozlowski CC: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] scsi: lpfc error path fix References: <200701020107.32742.m.kozlowski@tuxland.pl> In-Reply-To: <200701020107.32742.m.kozlowski@tuxland.pl> Content-Type: text/plain; charset=ISO-8859-2; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 03 Jan 2007 18:16:58.0238 (UTC) FILETIME=[5B3D99E0:01C72F63] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ACK -- james Mariusz Kozlowski wrote: > Hello, > > Add kmalloc failure check and fix the loop on error path. Without the > patch pool element at index [0] will not be freed. > > Signed-off-by: Mariusz Kozlowski > > drivers/scsi/lpfc/lpfc_mem.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff -upr linux-2.6.20-rc2-mm1-a/drivers/scsi/lpfc/lpfc_mem.c linux-2.6.20-rc2-mm1-b/drivers/scsi/lpfc/lpfc_mem.c > --- linux-2.6.20-rc2-mm1-a/drivers/scsi/lpfc/lpfc_mem.c 2006-12-24 05:00:32.000000000 +0100 > +++ linux-2.6.20-rc2-mm1-b/drivers/scsi/lpfc/lpfc_mem.c 2007-01-02 00:17:25.000000000 +0100 > @@ -56,6 +56,9 @@ lpfc_mem_alloc(struct lpfc_hba * phba) > > pool->elements = kmalloc(sizeof(struct lpfc_dmabuf) * > LPFC_MBUF_POOL_SIZE, GFP_KERNEL); > + if (!pool->elements) > + goto fail_free_lpfc_mbuf_pool; > + > pool->max_count = 0; > pool->current_count = 0; > for ( i = 0; i < LPFC_MBUF_POOL_SIZE; i++) { > @@ -82,10 +85,11 @@ lpfc_mem_alloc(struct lpfc_hba * phba) > fail_free_mbox_pool: > mempool_destroy(phba->mbox_mem_pool); > fail_free_mbuf_pool: > - while (--i) > + while (i--) > pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt, > pool->elements[i].phys); > kfree(pool->elements); > + fail_free_lpfc_mbuf_pool: > pci_pool_destroy(phba->lpfc_mbuf_pool); > fail_free_dma_buf_pool: > pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); > >