From f39e763efe789a0d59769a4437b7bdac45846b01 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 14 Nov 2016 22:08:37 -0700 Subject: [PATCH 1/2] osc/sm: plug a memory leak in ompi_osc_sm_free Thanks Joseph Schuchart for the report. Signed-off-by: Gilles Gouaillardet (cherry picked from commit open-mpi/ompi@f1b473ee635eda844b51d8d22525b64b9d09f253) --- ompi/mca/osc/sm/osc_sm_component.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ompi/mca/osc/sm/osc_sm_component.c b/ompi/mca/osc/sm/osc_sm_component.c index 8f2c929e301..0cf33eb1e3a 100644 --- a/ompi/mca/osc/sm/osc_sm_component.c +++ b/ompi/mca/osc/sm/osc_sm_component.c @@ -473,6 +473,8 @@ ompi_osc_sm_free(struct ompi_win_t *win) free(module->bases[0]); free(module->bases); free(module->sizes); + free(module->disp_units); + free(module->outstanding_locks); } free (module->posts); From 37a400409f71ee742a1eab8173ceae7500f38157 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 14 Nov 2016 23:19:07 -0700 Subject: [PATCH 2/2] osc/sm: plug an other memory leak in ompi_osc_sm_free Fixes open-mpi/ompi@f1b473ee635eda844b51d8d22525b64b9d09f253 Signed-off-by: Gilles Gouaillardet (cherry picked from commit open-mpi/ompi@bd364d29f7cf90f4b503734a8c8d58ec9f59bd52) --- ompi/mca/osc/sm/osc_sm_component.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/osc/sm/osc_sm_component.c b/ompi/mca/osc/sm/osc_sm_component.c index 0cf33eb1e3a..95b28e0a598 100644 --- a/ompi/mca/osc/sm/osc_sm_component.c +++ b/ompi/mca/osc/sm/osc_sm_component.c @@ -471,11 +471,11 @@ ompi_osc_sm_free(struct ompi_win_t *win) free(module->node_states); free(module->global_state); free(module->bases[0]); - free(module->bases); - free(module->sizes); - free(module->disp_units); - free(module->outstanding_locks); } + free(module->disp_units); + free(module->outstanding_locks); + free(module->sizes); + free(module->bases); free (module->posts);