From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753988Ab1CNLHX (ORCPT ); Mon, 14 Mar 2011 07:07:23 -0400 Received: from nm10-vm0.bullet.mail.sp2.yahoo.com ([98.139.91.198]:37718 "HELO nm10-vm0.bullet.mail.sp2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753149Ab1CNLHR (ORCPT ); Mon, 14 Mar 2011 07:07:17 -0400 X-Yahoo-Newman-Id: 412966.73120.bm@omp1053.mail.sp2.yahoo.com X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: wk75DCgVM1kIOrSRxDw6GjQdQjf_QAyoecmsG3uorq6rU0I tJpEevXXhL0kk.FHBc6S8jIHP9LLOj5JZ1ylvtaf6Vj7pX1fWTLZzpQ0W5rn 3BpH.ndLo3vkVgjiJI7ZdDx_XNxwoXc7Bz6b2K2_j2zIua5Hl.Dnew7ksdSO _eLi_5eajoMJIfdPZplhQh54nvsNmgOMWa5i6MHh2nuj6tZY2mfJkhQF6PYH RaB.vO4cVMOmgau9sm8FhD.iXsviCSzi8kfenhcCy_I10Kr7X4biC0kOwqfZ SJZKC9as9h071hQsyp.D_CrfA.cEhtVnpm8DsUpZBpvOPOzChQ0onfVwYJG4 yhqJNeDypno0fWHtqWRMl4LGf.2xZ2jPGNtouCJK8wqNfSfG50I2neSi8QVJ ro3NaTjFGR2RIiZrbchL_zbE.u6.4Jcn0CzuplQyJCbvViQZzUXJeSH19tPR Gf4IBKzxmguFfjocZkG8ItMVCIgxthKMeHSb4qzXEAQHLuzwNpR4aqKGnUBk ThUmgRWaD559WOJTQimblFhIJ5rRYHzcU1f8zbJHtmeCDiM0MMqFbuIEqJTd HejqdRoLuvdvuASW1HQLu.1iKITbx94BX X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: linux-scsi , linux-kernel , James Bottomley Cc: Christoph Hellwig , Mike Christie , Hannes Reinecke , FUJITA Tomonori , Boaz Harrosh , Joel Becker , Stephen Rothwell , Douglas Gilbert , Jesper Juhl , "Nicholas A. Bellinger" Subject: [PATCH 11/21] target: Avoid mem leak and needless work in transport_generic_get_mem Date: Mon, 14 Mar 2011 04:06:05 -0700 Message-Id: <1300100775-10012-12-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1300100775-10012-1-git-send-email-nab@linux-iscsi.org> References: <1300100775-10012-1-git-send-email-nab@linux-iscsi.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jesper Juhl In drivers/target/target_core_transport.c::transport_generic_get_mem() there are a few potential memory leaks in the error paths. This patch makes sure that we free previously allocated memory when other allocations fail. It also moves some work (INIT_LIST_HEAD() and assignment to se_mem->se_len) below all the allocations so that if something fails we don't do the work at all. Signed-off-by: Jesper Juhl Signed-off-by: Nicholas A. Bellinger --- drivers/target/target_core_transport.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 30c1223..af56ce2 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -4358,11 +4358,9 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size) printk(KERN_ERR "Unable to allocate struct se_mem\n"); goto out; } - INIT_LIST_HEAD(&se_mem->se_list); - se_mem->se_len = (length > dma_size) ? dma_size : length; /* #warning FIXME Allocate contigous pages for struct se_mem elements */ - se_mem->se_page = (struct page *) alloc_pages(GFP_KERNEL, 0); + se_mem->se_page = alloc_pages(GFP_KERNEL, 0); if (!(se_mem->se_page)) { printk(KERN_ERR "alloc_pages() failed\n"); goto out; @@ -4373,6 +4371,8 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size) printk(KERN_ERR "kmap_atomic() failed\n"); goto out; } + INIT_LIST_HEAD(&se_mem->se_list); + se_mem->se_len = (length > dma_size) ? dma_size : length; memset(buf, 0, se_mem->se_len); kunmap_atomic(buf, KM_IRQ0); @@ -4391,6 +4391,9 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size) return 0; out: + if (se_mem) + __free_pages(se_mem->se_page, 0); + kmem_cache_free(se_mem_cache, se_mem); return -1; } -- 1.7.4.1