DPDK patches and discussions
 help / color / mirror / Atom feed
From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, anatoly.burakov@intel.com
Subject: [dpdk-dev] [PATCH 03/10] mem: fix potential double close
Date: Tue, 17 Apr 2018 16:50:10 +0100	[thread overview]
Message-ID: <9a3e52dc5bb1cc7e4f62997d388a54164583d47a.1523977588.git.anatoly.burakov@intel.com> (raw)
In-Reply-To: <cover.1523977588.git.anatoly.burakov@intel.com>
In-Reply-To: <cover.1523977588.git.anatoly.burakov@intel.com>

We were closing descriptor before checking if mapping has
failed, but if it did, we did a second close afterwards. Fix
it by moving closing descriptor to after we check if mmap has
succeeded.

Coverity issue: 272560

Fixes: 2a04139f66b4 ("eal: add single file segments option")
Cc: anatoly.burakov@intel.com

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index 1f553dd..9156f8b 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -458,9 +458,6 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
 	 */
 	void *va = mmap(addr, alloc_sz, PROT_READ | PROT_WRITE,
 			MAP_SHARED | MAP_POPULATE | MAP_FIXED, fd, map_offset);
-	/* for non-single file segments, we can close fd here */
-	if (!internal_config.single_file_segments)
-		close(fd);
 
 	if (va == MAP_FAILED) {
 		RTE_LOG(DEBUG, EAL, "%s(): mmap() failed: %s\n", __func__,
@@ -471,6 +468,9 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id,
 		RTE_LOG(DEBUG, EAL, "%s(): wrong mmap() address\n", __func__);
 		goto mapped;
 	}
+	/* for non-single file segments, we can close fd here */
+	if (!internal_config.single_file_segments)
+		close(fd);
 
 	rte_iova_t iova = rte_mem_virt2iova(addr);
 	if (iova == RTE_BAD_PHYS_ADDR) {
-- 
2.7.4

  parent reply	other threads:[~2018-04-17 15:50 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-17 15:50 [dpdk-dev] [PATCH 00/10] Coverity fixes for EAL memory Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 01/10] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 02/10] mem: fix resource leak Anatoly Burakov
2018-04-17 15:50 ` Anatoly Burakov [this message]
2018-04-17 15:50 ` [dpdk-dev] [PATCH 04/10] mem: fix potential " Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 05/10] " Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 06/10] mem: fix comparing pointer to value Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 07/10] mem: fix potential bad unmap Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 08/10] mem: fix statement having no effect Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 09/10] mem: fix negative return value Anatoly Burakov
2018-04-17 15:50 ` [dpdk-dev] [PATCH 10/10] mem: fix possible use-after-free Anatoly Burakov
2018-04-17 15:56 ` [dpdk-dev] [PATCH 00/10] Coverity fixes for EAL memory Thomas Monjalon
2018-04-17 16:09   ` Burakov, Anatoly
2018-04-17 18:59     ` Thomas Monjalon
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 " Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 01/10] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 02/10] mem: fix resource leak Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 03/10] mem: fix potential double close Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 04/10] mem: fix potential resource leak Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 05/10] " Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 06/10] mem: fix comparing pointer to value Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 07/10] mem: fix potential bad unmap Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 08/10] mem: fix statement having no effect Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 09/10] mem: fix negative return value Anatoly Burakov
2018-04-18 10:37 ` [dpdk-dev] [PATCH v2 10/10] mem: fix possible use-after-free Anatoly Burakov
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 0/9] Coverity fixes for EAL memory Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 " Anatoly Burakov
2018-04-27 21:25     ` Thomas Monjalon
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 1/9] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 2/9] mem: fix resource leak Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 3/9] mem: fix potential double close Anatoly Burakov
2018-04-30  9:00     ` Bruce Richardson
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 4/9] mem: fix potential resource leak Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 5/9] " Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 6/9] mem: fix comparing pointer to value Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 7/9] mem: fix potential bad unmap Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 8/9] mem: fix statement having no effect Anatoly Burakov
2018-04-27 17:07   ` [dpdk-dev] [PATCH v4 9/9] mem: fix possible use-after-free Anatoly Burakov
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 1/9] mem: use strlcpy instead of snprintf Anatoly Burakov
2018-04-27 15:08   ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 2/9] mem: fix resource leak Anatoly Burakov
2018-04-27 15:13   ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 3/9] mem: fix potential double close Anatoly Burakov
2018-04-27 15:15   ` Bruce Richardson
2018-04-27 16:56     ` Burakov, Anatoly
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 4/9] mem: fix potential resource leak Anatoly Burakov
2018-04-27 15:18   ` Bruce Richardson
2018-04-27 15:28     ` Burakov, Anatoly
2018-04-27 15:39     ` Burakov, Anatoly
2018-04-27 15:48       ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 5/9] " Anatoly Burakov
2018-04-27 15:21   ` Bruce Richardson
2018-04-27 15:49     ` Burakov, Anatoly
2018-04-27 15:52       ` Bruce Richardson
2018-04-27 15:55     ` Burakov, Anatoly
2018-04-27 16:27       ` Bruce Richardson
2018-04-27 16:42         ` Burakov, Anatoly
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 6/9] mem: fix comparing pointer to value Anatoly Burakov
2018-04-27 15:22   ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 7/9] mem: fix potential bad unmap Anatoly Burakov
2018-04-27 15:37   ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 8/9] mem: fix statement having no effect Anatoly Burakov
2018-04-27 15:39   ` Bruce Richardson
2018-04-25  9:56 ` [dpdk-dev] [PATCH v3 9/9] mem: fix possible use-after-free Anatoly Burakov
2018-04-27 15:45   ` Bruce Richardson

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=9a3e52dc5bb1cc7e4f62997d388a54164583d47a.1523977588.git.anatoly.burakov@intel.com \
    --to=anatoly.burakov@intel.com \
    --cc=dev@dpdk.org \
    --cc=thomas@monjalon.net \
    /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).