From patchwork Thu Jun 16 15:14:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Kerlin X-Patchwork-Id: 13913 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id D3772C5A4; Thu, 16 Jun 2016 16:01:26 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 30807C468 for ; Thu, 16 Jun 2016 16:01:26 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 16 Jun 2016 07:01:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,480,1459839600"; d="scan'208";a="977049415" Received: from gklab-246-021.igk.intel.com (HELO HANLANCREEK9755-232) ([10.217.246.21]) by orsmga001.jf.intel.com with SMTP; 16 Jun 2016 07:01:03 -0700 Received: by HANLANCREEK9755-232 (sSMTP sendmail emulation); Thu, 16 Jun 2016 17:14:11 +0200 From: Marcin Kerlin To: david.marchand@6wind.com Cc: sergio.gonzalez.monroy@intel.com, dev@dpdk.org, Marcin Kerlin Date: Thu, 16 Jun 2016 17:14:00 +0200 Message-Id: <1466090040-14865-1-git-send-email-marcinx.kerlin@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465993510-13448-1-git-send-email-marcinx.kerlin@intel.com> References: <1465993510-13448-1-git-send-email-marcinx.kerlin@intel.com> Subject: [dpdk-dev] [PATCH v5 1/1] eal: fix resource leak of mapped memory 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Patch fixes resource leak in rte_eal_hugepage_attach() where mapped files were not freed back to the OS in case of failure. Patch uses the behavior of Linux munmap: "It is not an error if the indicated range does not contain any mapped pages". Coverity issue: 13295, 13296, 13303 Fixes: af75078fece3 ("first public release") Signed-off-by: Marcin Kerlin Acked-by: Sergio Gonzalez Monroy --- v5: -shift the history of changes v4: -removed keyword const from pointer and dependent on that casting (void *) v3: -removed redundant casting -removed update error message v2: -unmapping also previous addresses lib/librte_eal/linuxapp/eal/eal_memory.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 79d1d2d..c935765 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -1399,7 +1399,7 @@ int rte_eal_hugepage_attach(void) { const struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; - const struct hugepage_file *hp = NULL; + struct hugepage_file *hp = NULL; unsigned num_hp = 0; unsigned i, s = 0; /* s used to track the segment number */ off_t size; @@ -1481,7 +1481,7 @@ rte_eal_hugepage_attach(void) 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; } @@ -1545,12 +1545,19 @@ rte_eal_hugepage_attach(void) s++; } /* unmap the hugepage config file, since we are done using it */ - munmap((void *)(uintptr_t)hp, size); + munmap(hp, size); close(fd_zero); close(fd_hugepage); return 0; error: + s = 0; + while (s < RTE_MAX_MEMSEG && mcfg->memseg[s].len > 0) { + munmap(mcfg->memseg[s].addr, mcfg->memseg[s].len); + s++; + } + if (hp != NULL && hp != MAP_FAILED) + munmap(hp, size); if (fd_zero >= 0) close(fd_zero); if (fd_hugepage >= 0)