Skip to content

UCT: Prevent segfault in uct_rdmacm_cm_ep_str when id is not initialized [v1.10.x] #6228

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

Merged
yosefe merged 1 commit into from
Jan 29, 2021
Merged

UCT: Prevent segfault in uct_rdmacm_cm_ep_str when id is not initialized [v1.10.x] #6228

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
13 changes: 8 additions & 5 deletions src/uct/ib/rdmacm/rdmacm_cm_ep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
const char* uct_rdmacm_cm_ep_str(uct_rdmacm_cm_ep_t *cep, char *str,
size_t max_len)
{
struct sockaddr *local_addr = rdma_get_local_addr(cep->id);
struct sockaddr *remote_addr = rdma_get_peer_addr(cep->id);
struct sockaddr *local_addr = (cep->id != NULL) ?
rdma_get_local_addr(cep->id) : NULL;
struct sockaddr *remote_addr = (cep->id != NULL) ?
rdma_get_peer_addr(cep->id) : NULL;
char flags_buf[UCT_RDMACM_EP_FLAGS_STRING_LEN];
char local_ip_port_str[UCS_SOCKADDR_STRING_LEN];
char remote_ip_port_str[UCS_SOCKADDR_STRING_LEN];
Expand All @@ -33,13 +35,13 @@ const char* uct_rdmacm_cm_ep_str(uct_rdmacm_cm_ep_t *cep, char *str,
NULL
};

if (ucs_sockaddr_is_known_af(local_addr)) {
if ((local_addr != NULL) && ucs_sockaddr_is_known_af(local_addr)) {
ucs_sockaddr_str(local_addr, local_ip_port_str, UCS_SOCKADDR_STRING_LEN);
} else {
ucs_strncpy_safe(local_ip_port_str, "<invalid>", UCS_SOCKADDR_STRING_LEN);
}

if (ucs_sockaddr_is_known_af(remote_addr)) {
if ((remote_addr != NULL) && ucs_sockaddr_is_known_af(remote_addr)) {
ucs_sockaddr_str(remote_addr, remote_ip_port_str, UCS_SOCKADDR_STRING_LEN);
} else {
ucs_strncpy_safe(remote_ip_port_str, "<invalid>", UCS_SOCKADDR_STRING_LEN);
Expand Down Expand Up @@ -312,6 +314,7 @@ static ucs_status_t uct_rdamcm_cm_ep_server_init(uct_rdmacm_cm_ep_t *cep,
ucs_status_t status;
char ep_str[UCT_RDMACM_EP_STRING_LEN];

cep->id = event->id;
cep->flags |= UCT_RDMACM_CM_EP_ON_SERVER;

if (event->listen_id->channel != cm->ev_ch) {
Expand All @@ -338,7 +341,6 @@ static ucs_status_t uct_rdamcm_cm_ep_server_init(uct_rdmacm_cm_ep_t *cep,
goto err;
}

cep->id = event->id;
cep->id->context = cep;

memset(&conn_param, 0, sizeof(conn_param));
Expand Down Expand Up @@ -464,6 +466,7 @@ UCS_CLASS_INIT_FUNC(uct_rdmacm_cm_ep_t, const uct_ep_params_t *params)
self->qp = NULL;
self->flags = 0;
self->status = UCS_OK;
self->id = NULL;

if (params->field_mask & UCT_EP_PARAM_FIELD_SOCKADDR) {
status = uct_rdamcm_cm_ep_client_init(self, params);
Expand Down