From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <marcinx.kerlin@intel.com>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by dpdk.org (Postfix) with ESMTP id 3CB1D9619
for <dev@dpdk.org>; Tue, 14 Jun 2016 16:20:55 +0200 (CEST)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by fmsmga104.fm.intel.com with ESMTP; 14 Jun 2016 07:20:54 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.26,470,1459839600"; d="scan'208";a="987224167"
Received: from gklab-246-021.igk.intel.com (HELO HANLANCREEK9755-232)
([10.217.246.21])
by fmsmga001.fm.intel.com with SMTP; 14 Jun 2016 07:20:52 -0700
Received: by HANLANCREEK9755-232 (sSMTP sendmail emulation);
Tue, 14 Jun 2016 17:33:59 +0200
From: Marcin Kerlin <marcinx.kerlin@intel.com>
To: david.marchand@6wind.com
Cc: dev@dpdk.org, sergio.gonzalez.monroy@intel.com,
Marcin Kerlin <marcinx.kerlin@intel.com>
Date: Tue, 14 Jun 2016 17:33:55 +0200
Message-Id: <1465918435-30973-1-git-send-email-marcinx.kerlin@intel.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1461083251-31140-1-git-send-email-marcinx.kerlin@intel.com>
References: <1461083251-31140-1-git-send-email-marcinx.kerlin@intel.com>
Subject: [dpdk-dev] [PATCH v2 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2016 14:20:55 -0000
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 <marcinx.kerlin@intel.com>
---
lib/librte_eal/linuxapp/eal/eal_memory.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 79d1d2d..1834fa0 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -1417,7 +1417,7 @@ rte_eal_hugepage_attach(void)
if (internal_config.xen_dom0_support) {
#ifdef RTE_LIBRTE_XEN_DOM0
if (rte_xen_dom0_memory_attach() < 0) {
- RTE_LOG(ERR, EAL,"Failed to attach memory setments of primay "
+ RTE_LOG(ERR, EAL, "Failed to attach memory segments of primary "
"process\n");
return -1;
}
@@ -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;
}
@@ -1551,6 +1551,13 @@ rte_eal_hugepage_attach(void)
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((void *)(uintptr_t)hp, size);
if (fd_zero >= 0)
close(fd_zero);
if (fd_hugepage >= 0)
--
1.9.1