From 87b2720a48baa5e8137548b5d56436b49201ef3f Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 7 Dec 2017 09:00:55 +0900 Subject: [PATCH 1/2] mpool/base: plug a memory leak set the key of all mpool_tree_item objects, so they can be retrieved in mpool_base_free and then returned back to the mca_mpool_base_tree_item_free_list free list. Refs. open-mpi/ompi#4567 Thanks Philip Blakely for the bug report. Signed-off-by: Gilles Gouaillardet (cherry picked from commit open-mpi/ompi@11e5f86bf89d17f50e00ee8c07d9a336d99b67d2) --- opal/mca/mpool/base/mpool_base_alloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opal/mca/mpool/base/mpool_base_alloc.c b/opal/mca/mpool/base/mpool_base_alloc.c index 605ffbdf280..b34e438c1b6 100644 --- a/opal/mca/mpool/base/mpool_base_alloc.c +++ b/opal/mca/mpool/base/mpool_base_alloc.c @@ -14,6 +14,8 @@ * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2017 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -97,6 +99,7 @@ void *mca_mpool_base_alloc(size_t size, opal_info_t *info, const char *hints) mca_mpool_base_tree_item_put (mpool_tree_item); } else { mpool_tree_item->mpool = mpool; + mpool_tree_item->key = mem; mca_mpool_base_tree_insert (mpool_tree_item); } From 5478e27b53fe1a880548f23ff6b5c82fae187831 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 8 Dec 2017 09:32:05 +0900 Subject: [PATCH 2/2] NEWS: update NEWS file Plug a memory leak in MPI_Mem_free(). Thanks to Philip Blakely for reporting. Refs open-mpi/ompi@87b2720a48baa5e8137548b5d56436b49201ef3f Signed-off-by: Gilles Gouaillardet --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index d3668344793..21ec4559f5b 100644 --- a/NEWS +++ b/NEWS @@ -53,6 +53,13 @@ included in the vX.Y.Z section and be denoted as: (** also appeared: A.B.C) -- indicating that this item was previously included in release version vA.B.C. +2.1.3 -- To be released +------------------------ + +Bug fixes/minor improvements: + +- Plug a memory leak in MPI_Mem_free(). Thanks to Philip Blakely for reporting. + 2.1.2 -- September, 2017 ------------------------