Skip to content

pmix: fix misc memory leaks involving opal_convert_jobid_to_string #1296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

pmix: fix misc memory leaks involving opal_convert_jobid_to_string #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions opal/mca/pmix/external/pmix_ext_server_north.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
* All rights reserved.
Expand Down Expand Up @@ -415,7 +415,9 @@ static void opal_lkupcbfunc(int status,
n=0;
OPAL_LIST_FOREACH(p, data, opal_pmix_pdata_t) {
/* convert the jobid */
(void)snprintf(d[n].proc.nspace, PMIX_MAX_NSLEN, "%s", opal_convert_jobid_to_string(p->proc.jobid));
char *str = opal_convert_jobid_to_string(p->proc.jobid);
(void)strncpy(d[n].proc.nspace, str, PMIX_MAX_NSLEN);
free(str);
d[n].proc.rank = p->proc.vpid;
(void)strncpy(d[n].key, p->value.key, PMIX_MAX_KEYLEN);
pmix1_value_load(&d[n].value, &p->value);
Expand Down Expand Up @@ -532,9 +534,12 @@ static void opal_spncbfunc(int status, opal_jobid_t jobid, void *cbdata)
char nspace[PMIX_MAX_NSLEN];

if (NULL != opalcaddy->spwncbfunc) {
char *str;
rc = pmix1_convert_opalrc(status);
/* convert the jobid */
(void)snprintf(nspace, PMIX_MAX_NSLEN, "%s", opal_convert_jobid_to_string(jobid));
str = opal_convert_jobid_to_string(jobid);
(void)strncpy(nspace, str, PMIX_MAX_NSLEN);
free(str);
opalcaddy->spwncbfunc(rc, nspace, opalcaddy->cbdata);
}
OBJ_RELEASE(opalcaddy);
Expand Down
30 changes: 22 additions & 8 deletions opal/mca/pmix/external/pmix_ext_server_south.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
Expand Down Expand Up @@ -202,14 +202,14 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
opal_value_t *kv, *k2;
pmix_info_t *pinfo, *pmap;
size_t sz, szmap, m, n;
char nspace[PMIX_MAX_NSLEN];
char *nspace;
pmix_status_t rc;
pmix1_opcaddy_t *op;
opal_list_t *pmapinfo;
opal_pmix1_jobid_trkr_t *job;

/* convert the jobid */
(void)snprintf(nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(jobid));
nspace = opal_convert_jobid_to_string(jobid);

/* store this job in our list of known nspaces */
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
Expand Down Expand Up @@ -260,6 +260,7 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
if (PMIX_SUCCESS != rc) {
OBJ_RELEASE(op);
}
free(nspace);
return pmix1_convert_rc(rc);
}

Expand Down Expand Up @@ -288,14 +289,17 @@ int pmix1_server_register_client(const opal_process_name_t *proc,
{
pmix_status_t rc;
pmix1_opcaddy_t *op;
char *str;

/* setup the caddy */
op = OBJ_NEW(pmix1_opcaddy_t);
op->opcbfunc = cbfunc;
op->cbdata = cbdata;

/* convert the jobid */
(void)strncpy(op->p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(op->p.nspace, str, PMIX_MAX_NSLEN);
free(str);
op->p.rank = proc->vpid;

rc = PMIx_server_register_client(&op->p, uid, gid, server_object,
Expand Down Expand Up @@ -328,9 +332,12 @@ int pmix1_server_setup_fork(const opal_process_name_t *proc, char ***env)
{
pmix_status_t rc;
pmix_proc_t p;
char *str;

/* convert the jobid */
(void)strncpy(p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(p.nspace, str, PMIX_MAX_NSLEN);
free(str);
p.rank = proc->vpid;

rc = PMIx_server_setup_fork(&p, env);
Expand All @@ -357,14 +364,17 @@ int pmix1_server_dmodex(const opal_process_name_t *proc,
{
pmix1_opcaddy_t *op;
pmix_status_t rc;
char * str;

/* setup the caddy */
op = OBJ_NEW(pmix1_opcaddy_t);
op->mdxcbfunc = cbfunc;
op->cbdata = cbdata;

/* convert the jobid */
(void)strncpy(op->p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(op->p.nspace, str, PMIX_MAX_NSLEN);
free(str);
op->p.rank = proc->vpid;

/* find the internally-cached data for this proc */
Expand Down Expand Up @@ -395,7 +405,9 @@ int pmix1_server_notify_error(int status,
PMIX_PROC_CREATE(ps, psz);
n = 0;
OPAL_LIST_FOREACH(nm, procs, opal_namelist_t) {
(void)snprintf(ps[n].nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(nm->name.jobid));
char *str = opal_convert_jobid_to_string(nm->name.jobid);
(void)strncpy(ps[n].nspace, str, PMIX_MAX_NSLEN);
free(str);
ps[n].rank = (int)nm->name.vpid;
++n;
}
Expand All @@ -408,7 +420,9 @@ int pmix1_server_notify_error(int status,
PMIX_PROC_CREATE(eps, esz);
n = 0;
OPAL_LIST_FOREACH(nm, error_procs, opal_namelist_t) {
(void)snprintf(eps[n].nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(nm->name.jobid));
char *str = opal_convert_jobid_to_string(nm->name.jobid);
(void)strncpy(eps[n].nspace, str, PMIX_MAX_NSLEN);
free(str);
eps[n].rank = (int)nm->name.vpid;
++n;
}
Expand Down
7 changes: 5 additions & 2 deletions opal/mca/pmix/pmix112/pmix1_server_north.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved.
Expand Down Expand Up @@ -415,7 +415,10 @@ static void opal_lkupcbfunc(int status,
n=0;
OPAL_LIST_FOREACH(p, data, opal_pmix_pdata_t) {
/* convert the jobid */
(void)snprintf(d[n].proc.nspace, PMIX_MAX_NSLEN, "%s", opal_convert_jobid_to_string(p->proc.jobid));
char * str;
str = opal_convert_jobid_to_string(p->proc.jobid);
(void)strncpy(d[n].proc.nspace, str, PMIX_MAX_NSLEN);
free(str);
d[n].proc.rank = p->proc.vpid;
(void)strncpy(d[n].key, p->value.key, PMIX_MAX_KEYLEN);
pmix1_value_load(&d[n].value, &p->value);
Expand Down
30 changes: 22 additions & 8 deletions opal/mca/pmix/pmix112/pmix1_server_south.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved.
Expand Down Expand Up @@ -190,14 +190,14 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
opal_value_t *kv, *k2;
pmix_info_t *pinfo, *pmap;
size_t sz, szmap, m, n;
char nspace[PMIX_MAX_NSLEN];
char *nspace;
pmix_status_t rc;
pmix1_opcaddy_t *op;
opal_list_t *pmapinfo;
opal_pmix1_jobid_trkr_t *job;

/* convert the jobid */
(void)snprintf(nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(jobid));
nspace = opal_convert_jobid_to_string(jobid);

/* store this job in our list of known nspaces */
job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
Expand Down Expand Up @@ -248,6 +248,7 @@ int pmix1_server_register_nspace(opal_jobid_t jobid,
if (PMIX_SUCCESS != rc) {
OBJ_RELEASE(op);
}
free(nspace);
return pmix1_convert_rc(rc);
}

Expand Down Expand Up @@ -276,14 +277,17 @@ int pmix1_server_register_client(const opal_process_name_t *proc,
{
pmix_status_t rc;
pmix1_opcaddy_t *op;
char * str;

/* setup the caddy */
op = OBJ_NEW(pmix1_opcaddy_t);
op->opcbfunc = cbfunc;
op->cbdata = cbdata;

/* convert the jobid */
(void)strncpy(op->p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(op->p.nspace, str, PMIX_MAX_NSLEN);
free(str);
op->p.rank = proc->vpid;

rc = PMIx_server_register_client(&op->p, uid, gid, server_object,
Expand Down Expand Up @@ -316,9 +320,12 @@ int pmix1_server_setup_fork(const opal_process_name_t *proc, char ***env)
{
pmix_status_t rc;
pmix_proc_t p;
char * str;

/* convert the jobid */
(void)strncpy(p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(p.nspace, str, PMIX_MAX_NSLEN);
free(str);
p.rank = proc->vpid;

rc = PMIx_server_setup_fork(&p, env);
Expand All @@ -345,14 +352,17 @@ int pmix1_server_dmodex(const opal_process_name_t *proc,
{
pmix1_opcaddy_t *op;
pmix_status_t rc;
char *str;

/* setup the caddy */
op = OBJ_NEW(pmix1_opcaddy_t);
op->mdxcbfunc = cbfunc;
op->cbdata = cbdata;

/* convert the jobid */
(void)strncpy(op->p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
str = opal_convert_jobid_to_string(proc->jobid);
(void)strncpy(op->p.nspace, str, PMIX_MAX_NSLEN);
free(str);
op->p.rank = proc->vpid;

/* find the internally-cached data for this proc */
Expand Down Expand Up @@ -383,7 +393,9 @@ int pmix1_server_notify_error(int status,
PMIX_PROC_CREATE(ps, psz);
n = 0;
OPAL_LIST_FOREACH(nm, procs, opal_namelist_t) {
(void)snprintf(ps[n].nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(nm->name.jobid));
char *str = opal_convert_jobid_to_string(nm->name.jobid);
(void)strncpy(ps[n].nspace, str, PMIX_MAX_NSLEN);
free(str);
ps[n].rank = (int)nm->name.vpid;
++n;
}
Expand All @@ -396,7 +408,9 @@ int pmix1_server_notify_error(int status,
PMIX_PROC_CREATE(eps, esz);
n = 0;
OPAL_LIST_FOREACH(nm, error_procs, opal_namelist_t) {
(void)snprintf(eps[n].nspace, PMIX_MAX_NSLEN, opal_convert_jobid_to_string(nm->name.jobid));
char *str = opal_convert_jobid_to_string(nm->name.jobid);
(void)strncpy(eps[n].nspace, str, PMIX_MAX_NSLEN);
free(str);
eps[n].rank = (int)nm->name.vpid;
++n;
}
Expand Down
11 changes: 8 additions & 3 deletions opal/mca/pmix/pmix120/pmix120_server_north.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved.
Expand Down Expand Up @@ -415,7 +415,9 @@ static void opal_lkupcbfunc(int status,
n=0;
OPAL_LIST_FOREACH(p, data, opal_pmix_pdata_t) {
/* convert the jobid */
(void)snprintf(d[n].proc.nspace, PMIX_MAX_NSLEN, "%s", opal_convert_jobid_to_string(p->proc.jobid));
char *str = opal_convert_jobid_to_string(p->proc.jobid);
(void)strncpy(d[n].proc.nspace, str, PMIX_MAX_NSLEN);
free(str);
d[n].proc.rank = p->proc.vpid;
(void)strncpy(d[n].key, p->value.key, PMIX_MAX_KEYLEN);
pmix120_value_load(&d[n].value, &p->value);
Expand Down Expand Up @@ -532,9 +534,12 @@ static void opal_spncbfunc(int status, opal_jobid_t jobid, void *cbdata)
char nspace[PMIX_MAX_NSLEN];

if (NULL != opalcaddy->spwncbfunc) {
char *str;
rc = pmix120_convert_opalrc(status);
/* convert the jobid */
(void)snprintf(nspace, PMIX_MAX_NSLEN, "%s", opal_convert_jobid_to_string(jobid));
str = opal_convert_jobid_to_string(jobid);
(void)strncpy(nspace, str, PMIX_MAX_NSLEN);
free(str);
opalcaddy->spwncbfunc(rc, nspace, opalcaddy->cbdata);
}
OBJ_RELEASE(opalcaddy);
Expand Down
Loading