From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 08E342BC3 for ; Tue, 19 Apr 2016 17:19:41 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 19 Apr 2016 08:19:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,506,1455004800"; d="scan'208";a="948456480" Received: from gklab-246-021.igk.intel.com (HELO HANLANCREEK9755-232) ([10.217.246.21]) by fmsmga001.fm.intel.com with SMTP; 19 Apr 2016 08:19:35 -0700 Received: by HANLANCREEK9755-232 (sSMTP sendmail emulation); Tue, 19 Apr 2016 18:27:43 +0200 From: Marcin Kerlin To: dev@dpdk.org Cc: david.marchand@6wind.com, Marcin Kerlin Date: Tue, 19 Apr 2016 18:27:31 +0200 Message-Id: <1461083251-31140-1-git-send-email-marcinx.kerlin@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 1/1] lib/librte_eal: fix resource leak X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 15:19:42 -0000 Fix issue reported by Coverity. Coverity ID 13295, 13296, 13303: Resource leak: The system resource will not be reclaimed and reused, reducing the future availability of the resource. In rte_eal_hugepage_attach: Leak of memory or pointers to system resources. Fixes: af75078fece3 ("first public release") Signed-off-by: Marcin Kerlin --- lib/librte_eal/linuxapp/eal/eal_memory.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 5b9132c..6320aa0 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -1475,13 +1475,17 @@ rte_eal_hugepage_attach(void) "and retry running both primary " "and secondary processes\n"); } + + if (base_addr != MAP_FAILED) + munmap((void *)(uintptr_t)base_addr, mcfg->memseg[s].len); + goto error; } } size = getFileSize(fd_hugepage); hp = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd_hugepage, 0); - if (hp == NULL) { + if (hp == MAP_FAILED) { RTE_LOG(ERR, EAL, "Could not mmap %s\n", eal_hugepage_info_path()); goto error; } @@ -1535,6 +1539,10 @@ rte_eal_hugepage_attach(void) addr != RTE_PTR_ADD(base_addr, offset)) { RTE_LOG(ERR, EAL, "Could not mmap %s\n", hp[i].filepath); + + if (addr != MAP_FAILED) + munmap((void *)(uintptr_t)addr, mapping_size); + goto error; } offset+=mapping_size; @@ -1551,6 +1559,8 @@ rte_eal_hugepage_attach(void) return 0; error: + if (hp != NULL && hp != MAP_FAILED) + munmap((void *) (uintptr_t) hp, size); if (fd_zero >= 0) close(fd_zero); if (fd_hugepage >= 0) -- 1.9.1