From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id B9031C392 for ; Wed, 15 Jun 2016 10:49:07 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 15 Jun 2016 01:49:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,475,1459839600"; d="scan'208";a="1002310973" Received: from smonroyx-mobl.ger.corp.intel.com (HELO [10.237.220.48]) ([10.237.220.48]) by fmsmga002.fm.intel.com with ESMTP; 15 Jun 2016 01:49:05 -0700 To: Marcin Kerlin , david.marchand@6wind.com References: <1461083251-31140-1-git-send-email-marcinx.kerlin@intel.com> <1465918435-30973-1-git-send-email-marcinx.kerlin@intel.com> Cc: dev@dpdk.org From: Sergio Gonzalez Monroy Message-ID: Date: Wed, 15 Jun 2016 09:49:04 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <1465918435-30973-1-git-send-email-marcinx.kerlin@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2016 08:49:08 -0000 Hi Marcin, On 14/06/2016 16:33, Marcin Kerlin wrote: > 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 > --- > 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"); If you want to fix spelling of error message it probably should go in a different patch. > 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); No need for double casting, nor to cast to (void *). Sergio > if (fd_zero >= 0) > close(fd_zero); > if (fd_hugepage >= 0)