ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

orte/oob: fix misc memory leaks

Просмотр исходного кода 
as reported by Coverity as CIDs 1196748, 1196749 and 1269895
Этот коммит содержится в:
Gilles Gouaillardet 2015-03-02 13:50:59 +09:00
родитель cc7caf699e
Коммит d8f3b378b3
2 изменённых файлов: 18 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
orte/mca/oob/tcp/oob_tcp_listener.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -351,6 +353,7 @@ static int create_listen(void)
opal_output(0, "mca_oob_tcp_create_listen: getsockname(): %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
opal_argv_free(ports);
return ORTE_ERROR;
}
@ -358,6 +361,8 @@ static int create_listen(void)
if (listen(sd, SOMAXCONN) < 0) {
opal_output(0, "mca_oob_tcp_component_init: listen(): %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
opal_argv_free(ports);
return ORTE_ERROR;
}
@ -365,12 +370,16 @@ static int create_listen(void)
if ((flags = fcntl(sd, F_GETFL, 0)) < 0) {
opal_output(0, "mca_oob_tcp_component_init: fcntl(F_GETFL) failed: %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
opal_argv_free(ports);
return ORTE_ERROR;
}
flags |= O_NONBLOCK;
if (fcntl(sd, F_SETFL, flags) < 0) {
opal_output(0, "mca_oob_tcp_component_init: fcntl(F_SETFL) failed: %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
opal_argv_free(ports);
return ORTE_ERROR;
}
@ -393,18 +402,17 @@ static int create_listen(void)
break;
}
}
/* done with this, so release it */
opal_argv_free(ports);
if (0 == opal_list_get_size(&mca_oob_tcp_component.listeners)) {
/* cleanup */
if (0 <= sd) {
CLOSE_THE_SOCKET(sd);
}
opal_argv_free(ports);
return ORTE_ERR_SOCKET_NOT_AVAILABLE;
}
/* done with this, so release it */
opal_argv_free(ports);
return ORTE_SUCCESS;
}

7
orte/mca/oob/usock/oob_usock_listener.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -101,7 +103,7 @@ int orte_oob_usock_start_listening(void)
if (opal_fd_set_cloexec(sd) != OPAL_SUCCESS) {
opal_output(0, "%s unable to set socket to CLOEXEC",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
close(sd);
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
@ -119,6 +121,7 @@ int orte_oob_usock_start_listening(void)
if (listen(sd, SOMAXCONN) < 0) {
opal_output(0, "mca_oob_usock_component_init: listen(): %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
@ -126,12 +129,14 @@ int orte_oob_usock_start_listening(void)
if ((flags = fcntl(sd, F_GETFL, 0)) < 0) {
opal_output(0, "mca_oob_usock_component_init: fcntl(F_GETFL) failed: %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
flags |= O_NONBLOCK;
if (fcntl(sd, F_SETFL, flags) < 0) {
opal_output(0, "mca_oob_usock_component_init: fcntl(F_SETFL) failed: %s (%d)",
strerror(opal_socket_errno), opal_socket_errno);
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}