DPDK patches and discussions
 help / color / mirror / Atom feed
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>
Subject: [dpdk-dev] [PATCH v3 1/1] eal: fix resource leak of mapped memory
Date: Wed, 15 Jun 2016 12:45:10 +0200	[thread overview]
Message-ID: <1465987510-11491-1-git-send-email-marcinx.kerlin@intel.com> (raw)
In-Reply-To: <1465918435-30973-1-git-send-email-marcinx.kerlin@intel.com>

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".

V3:
1)removed redundant casting
2)removed update error message
V2:
1)unmapping also previous addresses 

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..44ff8e1 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -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((void *)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((void *)hp, size);
 	if (fd_zero >= 0)
 		close(fd_zero);
 	if (fd_hugepage >= 0)
-- 
1.9.1

  parent reply	other threads:[~2016-06-15  9:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 16:27 [dpdk-dev] [PATCH 1/1] lib/librte_eal: fix resource leak Marcin Kerlin
2016-04-20  9:15 ` David Marchand
2016-04-21 11:19   ` Sergio Gonzalez Monroy
2016-04-21 11:49     ` Kerlin, MarcinX
2016-04-22 10:42     ` Panu Matilainen
2016-06-14 15:33 ` [dpdk-dev] [PATCH v2 1/1] eal: fix resource leak of mapped memory Marcin Kerlin
2016-06-15  8:49   ` Sergio Gonzalez Monroy
2016-06-15  9:35     ` Kerlin, MarcinX
2016-06-15 10:05       ` Panu Matilainen
2016-06-15 11:13         ` Kerlin, MarcinX
2016-06-15 10:45   ` Marcin Kerlin [this message]
2016-06-15 12:25     ` [dpdk-dev] [PATCH v4 " Marcin Kerlin
2016-06-16 12:57       ` Sergio Gonzalez Monroy
2016-06-16 15:14       ` [dpdk-dev] [PATCH v5 " Marcin Kerlin
2016-06-20  9:30         ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465987510-11491-1-git-send-email-marcinx.kerlin@intel.com \
    --to=marcinx.kerlin@intel.com \
    --cc=david.marchand@6wind.com \
    --cc=dev@dpdk.org \
    --cc=sergio.gonzalez.monroy@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).