eal: fix mapping leak in secondary process

Have rte_eal_config_reattach clean up the mapped address which is a valid
address but not the one intended.

Coverity issue: 343439
Fixes: 4e8854ae89fa ("eal: do not panic on shared memory init")
Fixes: b149a7064261 ("eal/freebsd: add config reattach in secondary process")
Cc: stable@dpdk.org
Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>

diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index 270ce54ca0b8f8ef1b64161a2f50ded73feffcdd..f86e9aa3182b795d59340004ddfe62a7c8bd9397 100644 (file)
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -340,6 +340,7 @@ rte_eal_config_reattach(void)
                /* errno is stale, don't use */
                RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config at [%p], got [%p]\n",
                          rte_mem_cfg_addr, mem_config);
+               munmap(mem_config, sizeof(struct rte_mem_config));
                return -1;
        }
 

diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index c6ad231e0df1eedfe2f1f56783bc783b54178470..f39720637f6737d5d3ee898197b4dcae2a28e21d 100644 (file)
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -437,6 +437,7 @@ rte_eal_config_reattach(void)
                        RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config at [%p], got [%p]"
                                " - please use '--base-virtaddr' option\n",
                                rte_mem_cfg_addr, mem_config);
+                       munmap(mem_config, sizeof(struct rte_mem_config));
                        return -1;
                }
                RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config! error %i (%s)\n",