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 B29072B8D for ; Thu, 30 Jun 2016 15:32:08 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 30 Jun 2016 06:31:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,552,1459839600"; d="scan'208";a="727371411" Received: from smonroyx-mobl.ger.corp.intel.com (HELO [10.237.221.26]) ([10.237.221.26]) by FMSMGA003.fm.intel.com with ESMTP; 30 Jun 2016 06:31:24 -0700 To: Daniel Mrzyglod , david.marchand@6wind.com References: <1462982465-129762-1-git-send-email-danielx.t.mrzyglod@intel.com> <1466614235-121524-1-git-send-email-danielx.t.mrzyglod@intel.com> Cc: dev@dpdk.org From: Sergio Gonzalez Monroy Message-ID: <3f3b0684-4834-b855-bc8a-e386d2ac7ff1@intel.com> Date: Thu, 30 Jun 2016 14:31:24 +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: <1466614235-121524-1-git-send-email-danielx.t.mrzyglod@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v3] eal/linuxapp: 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: Thu, 30 Jun 2016 13:32:09 -0000 On 22/06/2016 17:50, Daniel Mrzyglod wrote: > This patch fix all cases to do proper handle all munmap if pointer > of hugepage is not NULL which prohibits resource leak. I would reword the above commit to something like: Current code does not munmap 'hugepage' mapping (hugepage info file) on function exit, leaking resources. > Coverity issue: 97920 > Fixes: b6a468ad41d5 ("memory: add --socket-mem option") > > Signed-off-by: Daniel Mrzyglod > --- > lib/librte_eal/linuxapp/eal/eal_memory.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c > index 9251a5b..9b0d39a 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_memory.c > +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c > @@ -1051,7 +1051,7 @@ int > rte_eal_hugepage_init(void) > { > struct rte_mem_config *mcfg; > - struct hugepage_file *hugepage, *tmp_hp = NULL; > + struct hugepage_file *hugepage = NULL, *tmp_hp = NULL; > struct hugepage_info used_hp[MAX_HUGEPAGE_SIZES]; > > uint64_t memory[RTE_MAX_NUMA_NODES]; > @@ -1367,13 +1367,15 @@ rte_eal_hugepage_init(void) > "of memory.\n", > i, nr_hugefiles, RTE_STR(CONFIG_RTE_MAX_MEMSEG), > RTE_MAX_MEMSEG); > - return -ENOMEM; > + goto fail; > } > I missed this but we should also munmap 'hugepage' on successful function exit. Sergio > return 0; > > fail: > free(tmp_hp); > + if (hugepage != NULL) > + munmap(hugepage, nr_hugefiles * sizeof(struct hugepage_file)); > return -1; > } >