From: Anatoly Burakov Date: Mon, 16 Apr 2018 15:11:55 +0000 (+0100) Subject: mem: fix potential double close on map failure X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=6f0fa9f238320669b024e8f36184b621d9ab2fb3 mem: fix potential double close on map failure 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've done all error checks. Coverity issue: 272560 Fixes: 2a04139f66b4 ("eal: add single file segments option") Signed-off-by: Anatoly Burakov --- diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c index 301c34ee7b..f48d10dcac 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__, @@ -502,6 +499,10 @@ alloc_seg(struct rte_memseg *ms, void *addr, int socket_id, (unsigned int)(alloc_sz >> 20)); goto mapped; } + /* for non-single file segments, we can close fd here */ + if (!internal_config.single_file_segments) + close(fd); + *(int *)addr = *(int *)addr; ms->addr = addr;