Skip to content

Commit 8820fd2

Browse files
awlauriaawlauria
authored
Merge pull request open-mpi#8486 from abouteiller/coverity/ulfm
ULFM followup: coverity reports
2 parents 4a627c6 + 15a18d1 commit 8820fd2

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

‎ompi/communicator/ft/comm_ft_detector.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2020 The University of Tennessee and The University
2+
* Copyright (c) 2016-2021 The University of Tennessee and The University
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
*
@@ -389,7 +389,7 @@ static int fd_heartbeat_request(comm_detector_t* detector) {
389389
memcpy(&msg->rdma_rreg[0], detector->hb_rdma_flag_lreg, regsize);
390390
msg->rdma_raddr = (uint64_t)&detector->hb_rdma_flag;
391391
}
392-
ret = ompi_comm_rbcast_send_msg(proc, &msg->super, sizeof(*msg)+regsize);
392+
ret = ompi_comm_rbcast_send_msg(proc, (ompi_comm_rbcast_message_t*)msg, sizeof(*msg)+regsize);
393393
free(msg);
394394
break;
395395
}
@@ -679,7 +679,7 @@ static int fd_heartbeat_send(comm_detector_t* detector) {
679679
msg.super.type = comm_heartbeat_recv_cb_type;
680680
msg.from = detector->hb_rdma_rank; /* comm->c_my_rank; except during finalize when it is equal to detector->hb_observer */
681681
ompi_proc_t* proc = ompi_comm_peer_lookup(comm, detector->hb_observer);
682-
ompi_comm_rbcast_send_msg(proc, &msg.super, sizeof(msg));
682+
ompi_comm_rbcast_send_msg(proc, (ompi_comm_rbcast_message_t*)&msg, sizeof(msg));
683683
return OMPI_SUCCESS;
684684
}
685685

‎ompi/communicator/ft/comm_ft_reliable_bcast.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2020 The University of Tennessee and The University
2+
* Copyright (c) 2013-2021 The University of Tennessee and The University
33
* of Tennessee Research Foundation. All rights
44
* reserved.
55
*
@@ -73,6 +73,7 @@ static int ompi_comm_rbcast_bmg(ompi_communicator_t* comm, ompi_comm_rbcast_mess
7373
proc = ompi_group_peer_lookup(lgrp, idx);
7474
}
7575
else {
76+
assert(NULL != hgrp); assert(OMPI_COMM_IS_INTER(comm));
7677
proc = ompi_group_peer_lookup(hgrp, idx-ompi_group_size(lgrp));
7778
}
7879
if( ompi_proc_is_active(proc) ) {
@@ -196,7 +197,7 @@ static void ompi_comm_rbcast_bml_recv_cb(
196197
}
197198

198199
/* invoke the local registered callback for the type */
199-
assert( 0 <= msg->type && RBCAST_CB_TYPE_MAX >= msg->type );
200+
assert( RBCAST_CB_TYPE_MAX >= msg->type );
200201
if( NULL != ompi_comm_rbcast_cb[msg->type] ) {
201202
if( ompi_comm_rbcast_cb[msg->type](comm, msg) ) {
202203
/* forward the rbcast */

‎ompi/dpm/dpm.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
268268
/* initiate a list of participants for the connect,
269269
* starting with our own members */
270270
OBJ_CONSTRUCT(&mlist, opal_list_t);
271+
assert(NULL != members /* would mean comm had 0-sized group! */);
271272
for (i=0; NULL != members[i]; i++) {
272273
OPAL_PMIX_CONVERT_STRING_TO_PROCT(&pxproc, members[i]);
273274
plt = OBJ_NEW(opal_proclist_t);
@@ -1674,6 +1675,9 @@ int ompi_dpm_dyn_init(void)
16741675
ptr = &tmp[0];
16751676
}
16761677
port_name = strdup(ptr);
1678+
if (NULL == port_name) {
1679+
return OMPI_ERR_OUT_OF_RESOURCE;
1680+
}
16771681

16781682
rc = ompi_dpm_connect_accept(MPI_COMM_WORLD, root, port_name, send_first, &newcomm);
16791683
free(port_name);

‎ompi/mca/coll/ftagree/coll_ftagree_earlyreturning.c‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; -*- */
22
/*
3-
* Copyright (c) 2014-2020 The University of Tennessee and The University
3+
* Copyright (c) 2014-2021 The University of Tennessee and The University
44
* of Tennessee Research Foundation. All rights
55
* reserved.
66
*
@@ -1006,6 +1006,7 @@ static void era_combine_agreement_values(era_agreement_info_t *ni, era_value_t *
10061006
ni->current_value->header.max_aid = value->header.max_aid;
10071007
}
10081008

1009+
assert(NULL != value->new_dead_array || 0 == value->header.nb_new_dead);
10091010
era_merge_new_dead_list(ni, value->header.nb_new_dead, value->new_dead_array);
10101011
}
10111012

@@ -1655,7 +1656,7 @@ static void era_decide(era_value_t *decided_value, era_agreement_info_t *ci)
16551656
OPAL_OUTPUT_VERBOSE(((ci->comm->c_my_rank == r)? 2: 10, ompi_ftmpi_output_handle,
16561657
"%s ftagree:agreement (ERA) decide %08x.%d.%d.. on agreement (%d.%d).%d\n",
16571658
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME),
1658-
(0!=ERA_VALUE_BYTES_COUNT(&decided_value->header))? *(int*)decided_value->bytes: 0,
1659+
(NULL != decided_value->bytes)? *(int*)decided_value->bytes: 0,
16591660
decided_value->header.ret,
16601661
decided_value->header.nb_new_dead,
16611662
ci->agreement_id.ERAID_FIELDS.contextid,
@@ -1673,7 +1674,7 @@ static void era_decide(era_value_t *decided_value, era_agreement_info_t *ci)
16731674
OPAL_OUTPUT_VERBOSE((30, ompi_ftmpi_output_handle,
16741675
"%s ftagree:agreement (ERA) decide %08x.%d.%d on agreement (%d.%d).%d: adding up to %d processes to the list of agreed deaths\n",
16751676
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME),
1676-
(0!=ERA_VALUE_BYTES_COUNT(&decided_value->header))? *(int*)decided_value->bytes: 0,
1677+
(NULL != decided_value->bytes)? *(int*)decided_value->bytes: 0,
16771678
decided_value->header.ret,
16781679
decided_value->header.nb_new_dead,
16791680
ci->agreement_id.ERAID_FIELDS.contextid,
@@ -1734,7 +1735,7 @@ static void era_decide(era_value_t *decided_value, era_agreement_info_t *ci)
17341735
OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
17351736
"%s ftagree:agreement (ERA) decide %08x.%d.%d.. on agreement (%d.%d).%d: group of agreed deaths is of size %d\n",
17361737
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME),
1737-
(0!=ERA_VALUE_BYTES_COUNT(&decided_value->header))? *(int*)decided_value->bytes: 0,
1738+
(NULL != decided_value->bytes)? *(int*)decided_value->bytes: 0,
17381739
decided_value->header.ret,
17391740
decided_value->header.nb_new_dead,
17401741
ci->agreement_id.ERAID_FIELDS.contextid,
@@ -2119,7 +2120,7 @@ static void send_msg(ompi_communicator_t *comm,
21192120
agreement_id.ERAID_FIELDS.epoch,
21202121
agreement_id.ERAID_FIELDS.agreementid,
21212122
era_msg_type_to_string(type),
2122-
(0!=ERA_VALUE_BYTES_COUNT(&value->header))? *(int*)value->bytes: 0,
2123+
(NULL != value->bytes)? *(int*)value->bytes: 0,
21232124
value->header.ret,
21242125
value->header.nb_new_dead,
21252126
dst,
@@ -2136,7 +2137,7 @@ static void send_msg(ompi_communicator_t *comm,
21362137
agreement_id.ERAID_FIELDS.epoch,
21372138
agreement_id.ERAID_FIELDS.agreementid,
21382139
era_msg_type_to_string(type),
2139-
(0!=ERA_VALUE_BYTES_COUNT(&value->header))? *(int*)value->bytes: 0,
2140+
(NULL != value->bytes)? *(int*)value->bytes: 0,
21402141
value->header.ret,
21412142
value->header.nb_new_dead,
21422143
nb_ack_failed,
@@ -2150,7 +2151,7 @@ static void send_msg(ompi_communicator_t *comm,
21502151
agreement_id.ERAID_FIELDS.epoch,
21512152
agreement_id.ERAID_FIELDS.agreementid,
21522153
era_msg_type_to_string(type),
2153-
(0!=ERA_VALUE_BYTES_COUNT(&value->header))? *(int*)value->bytes: 0,
2154+
(NULL != value->bytes)? *(int*)value->bytes: 0,
21542155
value->header.ret,
21552156
value->header.nb_new_dead,
21562157
dst,
@@ -2230,7 +2231,7 @@ static void send_msg(ompi_communicator_t *comm,
22302231
agreement_id.ERAID_FIELDS.epoch,
22312232
agreement_id.ERAID_FIELDS.agreementid,
22322233
era_msg_type_to_string(type),
2233-
(0!=ERA_VALUE_BYTES_COUNT(&value->header))? *(int*)value->bytes: 0,
2234+
(NULL != value->bytes)? *(int*)value->bytes: 0,
22342235
value->header.ret,
22352236
value->header.nb_new_dead,
22362237
msg_header.nb_ack,
@@ -2274,7 +2275,7 @@ static void send_msg(ompi_communicator_t *comm,
22742275
agreement_id.ERAID_FIELDS.epoch,
22752276
agreement_id.ERAID_FIELDS.agreementid,
22762277
era_msg_type_to_string(type),
2277-
(0!=ERA_VALUE_BYTES_COUNT(&value->header))? *(int*)value->bytes: 0,
2278+
(NULL != value->bytes)? *(int*)value->bytes: 0,
22782279
value->header.ret,
22792280
value->header.nb_new_dead,
22802281
msg_header.nb_ack,
@@ -2421,7 +2422,7 @@ static void msg_up(era_msg_header_t *msg_header, uint8_t *bytes, int *new_dead,
24212422
msg_header->agreement_id.ERAID_FIELDS.agreementid,
24222423
msg_header->src_comm_rank,
24232424
OMPI_NAME_PRINT(&msg_header->src_proc_name),
2424-
(0!=ERA_VALUE_BYTES_COUNT(&msg_header->agreement_value_header))? *(int*)bytes: 0,
2425+
(NULL != bytes)? *(int*)bytes: 0,
24252426
msg_header->agreement_value_header.ret,
24262427
msg_header->agreement_value_header.nb_new_dead,
24272428
msg_header->nb_ack));
@@ -2552,7 +2553,7 @@ static void msg_down(era_msg_header_t *msg_header, uint8_t *bytes, int *new_dead
25522553
msg_header->agreement_id.ERAID_FIELDS.agreementid,
25532554
msg_header->src_comm_rank,
25542555
OMPI_NAME_PRINT(&msg_header->src_proc_name),
2555-
(0!=ERA_VALUE_BYTES_COUNT(&msg_header->agreement_value_header))? *(int*)bytes: 0,
2556+
(NULL != bytes)? *(int*)bytes: 0,
25562557
msg_header->agreement_value_header.nb_new_dead));
25572558

25582559
ci = era_lookup_agreement_info( msg_header->agreement_id );
@@ -2723,7 +2724,7 @@ static void era_cb_fn(struct mca_btl_base_module_t* btl,
27232724
msg_header->agreement_id.ERAID_FIELDS.epoch,
27242725
msg_header->agreement_id.ERAID_FIELDS.agreementid,
27252726
msg_header->msg_type,
2726-
(0!=ERA_VALUE_BYTES_COUNT(&msg_header->agreement_value_header))? *(int*)value_bytes: 0,
2727+
(NULL != value_bytes)? *(int*)value_bytes: 0,
27272728
msg_header->agreement_value_header.ret,
27282729
msg_header->agreement_value_header.nb_new_dead,
27292730
msg_header->src_comm_rank,
@@ -3115,12 +3116,12 @@ static int mca_coll_ftagree_era_complete_agreement(era_identifier_t agreement_id
31153116

31163117
assert(0 != agreement_id.ERAID_FIELDS.agreementid);
31173118
ci = era_lookup_agreement_info(agreement_id);
3119+
assert(NULL != ci);
3120+
comm = ci->comm;
31183121

31193122
/** Now, it's time to remove that guy from the ongoing agreements */
31203123
opal_hash_table_remove_value_uint64(&era_ongoing_agreements, agreement_id.ERAID_KEY);
31213124

3122-
comm = ci->comm;
3123-
31243125
OBJ_RELEASE(ci); /* This will take care of the content of ci too */
31253126

31263127
ret = opal_hash_table_get_value_uint64(&era_passed_agreements,
@@ -3156,7 +3157,7 @@ static int mca_coll_ftagree_era_complete_agreement(era_identifier_t agreement_id
31563157
agreement_id.ERAID_FIELDS.epoch,
31573158
agreement_id.ERAID_FIELDS.agreementid,
31583159
ret,
3159-
(0!=ERA_VALUE_BYTES_COUNT(&av->header))? *(int*)contrib: 0));
3160+
(NULL != contrib)? *(int*)contrib: 0));
31603161

31613162
return ret;
31623163
}

‎ompi/mca/coll/ftagree/coll_ftagree_earlyterminating.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ mca_coll_ftagree_eta_intra(void *contrib,
101101
{ /* ignore acked failures (add them later to the result) */
102102
ompi_group_t* ackedgrp = NULL; int npa; int *aranks, *cranks;
103103
ackedgrp = *group;
104-
if( 0 != (npa = ompi_group_size(ackedgrp)) ) {
104+
if( 0 != (npa = (NULL == ackedgrp? 0: ompi_group_size(ackedgrp))) ) {
105105
aranks = calloc( npa, sizeof(int) );
106106
for( i = 0; i < npa; i++ ) aranks[i] = i;
107107
cranks = calloc( npa, sizeof(int) );
@@ -336,7 +336,7 @@ mca_coll_ftagree_eta_intra(void *contrib,
336336
free(statuses);
337337
free(in);
338338
/* Let's build the group of failed processes */
339-
if( NULL != group ) {
339+
if( update_grp ) {
340340
int pos;
341341
/* We overwrite proc_status because it is not used anymore */
342342
int *failed = proc_status;
@@ -346,10 +346,10 @@ mca_coll_ftagree_eta_intra(void *contrib,
346346
failed[pos++] = i;
347347
}
348348
}
349-
if( update_grp ) {
349+
if( NULL != *group ) {
350350
OBJ_RELEASE(*group);
351-
ompi_group_incl(comm->c_remote_group, pos, failed, group);
352351
}
352+
ompi_group_incl(comm->c_remote_group, pos, failed, group);
353353
}
354354
free(proc_status);
355355

@@ -363,7 +363,7 @@ mca_coll_ftagree_eta_intra(void *contrib,
363363
OPAL_OUTPUT_VERBOSE((5, ompi_ftmpi_output_handle,
364364
"%s ftagree:agreement (ETA) return %d with 4 first bytes of result 0x%08x and dead group with %d processes",
365365
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), ret, *(int*)contrib,
366-
(NULL == group) ? 0 : (*group)->grp_proc_count));
366+
(NULL == *group) ? 0 : (*group)->grp_proc_count));
367367
return ret;
368368
}
369369

‎opal/mca/base/mca_base_var.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
44
* University Research and Technology
55
* Corporation. All rights reserved.
6-
* Copyright (c) 2004-2012 The University of Tennessee and The University
6+
* Copyright (c) 2004-2021 The University of Tennessee and The University
77
* of Tennessee Research Foundation. All rights
88
* reserved.
99
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,

0 commit comments

Comments
 (0)