Merge pull request #963 from hjelmn/ompi_coverity

fcoll/two_phase: fix coverity errors

ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c

@@ -366,24 +366,20 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
 	    goto exit;
         }
 
-	blocklen_per_process = (int **)malloc (fh->f_procs_per_group * sizeof (int*));
+	blocklen_per_process = (int **)calloc (fh->f_procs_per_group, sizeof (int*));
         if (NULL == blocklen_per_process) {
             opal_output (1, "OUT OF MEMORY\n");
             ret = OMPI_ERR_OUT_OF_RESOURCE;
 	    goto exit;
         }
 
-	displs_per_process = (MPI_Aint **)malloc (fh->f_procs_per_group * sizeof (MPI_Aint*));
+	displs_per_process = (MPI_Aint **)calloc (fh->f_procs_per_group, sizeof (MPI_Aint*));
 	if (NULL == displs_per_process) {
             opal_output (1, "OUT OF MEMORY\n");
             ret = OMPI_ERR_OUT_OF_RESOURCE;
 	    goto exit;
         }
 
-	for(i=0;i<fh->f_procs_per_group;i++){
-            blocklen_per_process[i] = NULL;
-            displs_per_process[i] = NULL;
-	}
 	recv_req = (MPI_Request *)malloc ((fh->f_procs_per_group)*sizeof(MPI_Request));
 	if ( NULL == recv_req ) {
 	    opal_output (1, "OUT OF MEMORY\n");
@@ -439,22 +435,12 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh,
             for(l=0;l<fh->f_procs_per_group;l++){
                 disp_index[l] =  1;
 
-                if (NULL != blocklen_per_process[l]){
                 free(blocklen_per_process[l]);
-                    blocklen_per_process[l] = NULL;
-                }
-                if (NULL != displs_per_process[l]){
                 free(displs_per_process[l]);
-                    displs_per_process[l] = NULL;
+
-                }
                 blocklen_per_process[l] = (int *) calloc (1, sizeof(int));
-                if (NULL == blocklen_per_process[l]) {
-                    opal_output (1, "OUT OF MEMORY for blocklen\n");
-                    ret = OMPI_ERR_OUT_OF_RESOURCE;
-                    goto exit;
-                }
                 displs_per_process[l] = (MPI_Aint *) calloc (1, sizeof(MPI_Aint));
-                if (NULL == displs_per_process[l]){
+                if (NULL == displs_per_process[l] || NULL == blocklen_per_process[l]){
                     opal_output (1, "OUT OF MEMORY for displs\n");
                     ret = OMPI_ERR_OUT_OF_RESOURCE;
                     goto exit;
@@ -1044,24 +1030,16 @@ exit :
             global_buf = NULL;
         }
         for(l=0;l<fh->f_procs_per_group;l++){
-            if (NULL != blocklen_per_process[l]){
-                free(blocklen_per_process[l]);
-                blocklen_per_process[l] = NULL;
-            }
-            if (NULL != displs_per_process[l]){
-                free(displs_per_process[l]);
-                displs_per_process[l] = NULL;
-            }
-        }
             if (NULL != blocklen_per_process){
-            free(blocklen_per_process);
+                free(blocklen_per_process[l]);
-            blocklen_per_process = NULL;
             }
             if (NULL != displs_per_process){
-            free(displs_per_process);
+                free(displs_per_process[l]);
-            displs_per_process = NULL;
+            }
         }
 
+        free(blocklen_per_process);
+        free(displs_per_process);
     }
 
     if (NULL != displs){

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -11,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2008-2014 University of Houston. All rights reserved.
  * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -186,7 +189,7 @@ mca_fcoll_two_phase_file_read_all (mca_io_ompio_file_t *fh,
 					  two_phase_num_io_procs,
 					  max_data);
 	if (OMPI_SUCCESS != ret){
-	    return ret;
+            goto exit;
 	}
 
 	two_phase_num_io_procs = fh->f_final_num_aggrs;
@@ -497,21 +500,19 @@ exit:
 	if (flat_buf->indices != NULL){
 	    free (flat_buf->indices);
 	}
-	free(flat_buf);
 	flat_buf = NULL;
     }
-    if (start_offsets != NULL){
+
     free (start_offsets);
-	start_offsets = NULL;
-    }
-    if (end_offsets != NULL){
     free (end_offsets);
-	end_offsets = NULL;
-    }
-    if (aggregator_list != NULL){
     free (aggregator_list);
-	aggregator_list = NULL;
+    free (fd_start);
-    }
+    free (decoded_iov);
+    free (buf_indices);
+    free (count_my_req_per_proc);
+    free (my_req);
+    free (others_req);
+    free (fd_end);
 
     return ret;
 }
@@ -635,7 +636,7 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh,
     start_pos = (int *) calloc(fh->f_size, sizeof(int));
     if ( NULL == start_pos ){
         ret = OMPI_ERR_OUT_OF_RESOURCE;
-	return ret;
+        goto exit;
     }
 
     done = 0;
@@ -717,7 +718,8 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh,
 		(1,sizeof(mca_io_ompio_io_array_t));
 	    if (NULL == fh->f_io_array) {
 		opal_output(1, "OUT OF MEMORY\n");
-		return OMPI_ERR_OUT_OF_RESOURCE;
+                ret = OMPI_ERR_OUT_OF_RESOURCE;
+                goto exit;
 	    }
 	    fh->f_io_array[0].offset = (IOVBASE_TYPE *)(intptr_t)off;
 	    fh->f_io_array[0].length = len;
@@ -728,7 +730,8 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh,
 	    if (fh->f_num_of_io_entries){
 		if ( 0 > fh->f_fbtl->fbtl_preadv (fh)) {
 		    opal_output(1, "READ FAILED\n");
-		    return OMPI_ERROR;
+                    ret = OMPI_ERROR;
+                    goto exit;
 		}
 	    }
 
@@ -797,40 +800,17 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh,
 				flat_buf, others_req, m, buf_idx,
 				buftype_extent, striping_unit, two_phase_num_io_procs,
 				aggregator_list);
-    if (ntimes){
-	free(read_buf);
-	read_buf = NULL;
-    }
-    if (NULL != curr_offlen_ptr){
-	free(curr_offlen_ptr);
-	curr_offlen_ptr = NULL;
-    }
-    if (NULL != count){
-	free(count);
-	count = NULL;
-    }
-    if (NULL != partial_send){
-	free(partial_send);
-	partial_send = NULL;
-    }
-    if (NULL != send_size){
-	free(send_size);
-	send_size = NULL;
-    }
-    if (NULL != recv_size){
-	free(recv_size);
-	recv_size = NULL;
-    }
-    if (NULL != recd_from_proc){
-	free(recd_from_proc);
-	recd_from_proc = NULL;
-    }
-    if (NULL != start_pos){
-	free(start_pos);
-	start_pos = NULL;
-    }
 
 exit:
+    free (read_buf);
+    free (curr_offlen_ptr);
+    free (count);
+    free (partial_send);
+    free (send_size);
+    free (recv_size);
+    free (recd_from_proc);
+    free (start_pos);
+
     return ret;
 
 }
@@ -919,7 +899,7 @@ static int two_phase_exchange_data(mca_io_ompio_file_t *fh,
     }
     else{
 
-	recv_buf = (char **)malloc(fh->f_size * sizeof(char *));
+	recv_buf = (char **) calloc (fh->f_size, sizeof(char *));
 	if (NULL == recv_buf){
 	    ret = OMPI_ERR_OUT_OF_RESOURCE;
 	    goto exit;
@@ -983,7 +963,9 @@ static int two_phase_exchange_data(mca_io_ompio_file_t *fh,
 	ret = ompi_request_wait_all(nprocs_recv,
 				    requests,
 				    MPI_STATUS_IGNORE);
-
+        if (OMPI_SUCCESS != ret) {
+            goto exit;
+        }
 
 	if (! (fh->f_flags & OMPIO_CONTIGUOUS_MEMORY)) {
 
@@ -1001,26 +983,23 @@ static int two_phase_exchange_data(mca_io_ompio_file_t *fh,
 				requests+nprocs_recv,
 				MPI_STATUS_IGNORE);
 
-    if (NULL != requests){
-	free(requests);
-	requests = NULL;
-    }
-
-    if (! (fh->f_flags & OMPIO_CONTIGUOUS_MEMORY)){
-	for (i=0; i< fh->f_size; i++){
-	    if (recv_size[i]){
-		free(recv_buf[i]);
-	    }
-	}
-	free(recv_buf);
-    }
-
 #if OMPIO_FCOLL_WANT_TIME_BREAKDOWN
     end_rcomm_time = MPI_Wtime();
     rcomm_time += (end_rcomm_time - start_rcomm_time);
 #endif
 
 exit:
+
+    if (recv_buf) {
+	for (i=0; i< fh->f_size; i++){
+            free(recv_buf[i]);
+	}
+
+	free(recv_buf);
+    }
+
+    free(requests);
+
     return ret;
 
 }

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -12,6 +13,8 @@
  * Copyright (c) 2008-2014 University of Houston. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -220,7 +223,7 @@ mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh,
 					  two_phase_num_io_procs,
 					  max_data);
 	if ( OMPI_SUCCESS != ret){
-	    return  ret;
+            goto exit;
 	}
 
 	two_phase_num_io_procs = fh->f_final_num_aggrs;
@@ -237,7 +240,8 @@ mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh,
 
     aggregator_list = (int *) malloc (two_phase_num_io_procs *sizeof(int));
     if ( NULL == aggregator_list ) {
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     for (i =0; i< two_phase_num_io_procs; i++){
@@ -271,7 +275,8 @@ mca_fcoll_two_phase_file_write_all (mca_io_ompio_file_t *fh,
 
     if ( 0 == total_bytes ) {
         free(aggregator_list);
-	return OMPI_SUCCESS;
+        ret = OMPI_SUCCESS;
+        goto exit;
     }
 
     if (!(fh->f_flags & OMPIO_CONTIGUOUS_MEMORY)) {
@@ -560,17 +565,16 @@ exit :
     }
 
 
-
-    if (start_offsets != NULL) {
     free (start_offsets);
-    }
-
-    if (end_offsets != NULL){
     free (end_offsets);
-    }
-    if (aggregator_list != NULL){
     free (aggregator_list);
-    }
+    free (decoded_iov);
+    free (fd_start);
+    free (fd_end);
+    free (others_req);
+    free (my_req);
+    free (buf_indices);
+    free (count_my_req_per_proc);
 
     return ret;
 }
@@ -657,61 +661,71 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh,
     curr_offlen_ptr = (int *) calloc(fh->f_size, sizeof(int));
 
     if ( NULL == curr_offlen_ptr ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     count = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == count ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     partial_recv = (int *)calloc(fh->f_size, sizeof(int));
 
     if ( NULL == partial_recv ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     send_size = (int *) calloc(fh->f_size,sizeof(int));
 
     if ( NULL == send_size ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     recv_size = (int *) calloc(fh->f_size,sizeof(int));
 
     if ( NULL == recv_size ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     send_buf_idx = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == send_buf_idx ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     sent_to_proc = (int *) calloc(fh->f_size, sizeof(int));
 
     if ( NULL == sent_to_proc){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     curr_to_proc = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == curr_to_proc ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     done_to_proc = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == done_to_proc ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     start_pos = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == start_pos ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+      ret = OMPI_ERR_OUT_OF_RESOURCE;
+      goto exit;
     }
 
 
@@ -818,7 +832,8 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh,
 		(sizeof(mca_io_ompio_io_array_t));
 	    if (NULL == fh->f_io_array) {
 		opal_output(1, "OUT OF MEMORY\n");
-		return OMPI_ERR_OUT_OF_RESOURCE;
+		ret = OMPI_ERR_OUT_OF_RESOURCE;
+                goto exit;
 	    }
 
 	    fh->f_io_array[0].offset  =(IOVBASE_TYPE *)(intptr_t) off;
@@ -839,7 +854,8 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh,
 	    if (fh->f_num_of_io_entries){
 		if ( 0 > fh->f_fbtl->fbtl_pwritev (fh)) {
 		    opal_output(1, "WRITE FAILED\n");
-		    return OMPI_ERROR;
+                    ret = OMPI_ERROR;
+                    goto exit;
 		}
 	    }
 #if OMPIO_FCOLL_WANT_TIME_BREAKDOWN
@@ -883,41 +899,17 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh,
 
 exit:
 
-    if (ntimes){
-	if ( NULL != write_buf ){
     free (write_buf);
-	}
-    }
-    if ( NULL != curr_offlen_ptr ){
     free (curr_offlen_ptr);
-    }
-    if ( NULL != count ){
     free (count);
-    }
-    if ( NULL != partial_recv ){
     free (partial_recv);
-    }
-    if ( NULL != send_size ){
     free (send_size);
-    }
-    if ( NULL != recv_size ){
     free (recv_size);
-    }
-    if ( NULL != sent_to_proc ){
     free (sent_to_proc);
-    }
-    if ( NULL != start_pos ){
     free (start_pos);
-    }
-    if ( NULL != send_buf_idx ){
     free (send_buf_idx);
-    }
-    if ( NULL != curr_to_proc ){
     free (curr_to_proc);
-    }
-    if ( NULL != done_to_proc ){
     free (done_to_proc);
-    }
 
     return ret;
 }
@@ -986,7 +978,8 @@ static int two_phase_exchage_data(mca_io_ompio_file_t *fh,
     tmp_len = (int *) malloc(fh->f_size*sizeof(int));
 
     if ( NULL == tmp_len ) {
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     j = 0;
@@ -1076,7 +1069,8 @@ static int two_phase_exchage_data(mca_io_ompio_file_t *fh,
 		if (fh->f_num_of_io_entries){
 		    if ( 0 >  fh->f_fbtl->fbtl_preadv (fh)) {
 			opal_output(1, "READ FAILED\n");
-			return OMPI_ERROR;
+                        ret = OMPI_ERROR;
+                        goto exit;
 		    }
 		}
 
@@ -1100,7 +1094,8 @@ static int two_phase_exchage_data(mca_io_ompio_file_t *fh,
 	malloc((nprocs_send+nprocs_recv+1)*sizeof(MPI_Request));
 
     if ( NULL == requests ){
-	return OMPI_ERR_OUT_OF_RESOURCE;
+        ret = OMPI_ERR_OUT_OF_RESOURCE;
+        goto exit;
     }
 
     j = 0;
@@ -1145,7 +1140,7 @@ static int two_phase_exchage_data(mca_io_ompio_file_t *fh,
 	    }
     }
     else if(nprocs_send && (!(fh->f_flags & OMPIO_CONTIGUOUS_MEMORY))){
-	send_buf = (char **) malloc(fh->f_size*sizeof(char*));
+	send_buf = (char **) calloc (fh->f_size, sizeof(char*));
 	if ( NULL == send_buf ){
 	    ret = OMPI_ERR_OUT_OF_RESOURCE;
 	    goto exit;
@@ -1177,27 +1172,29 @@ static int two_phase_exchage_data(mca_io_ompio_file_t *fh,
     }
 
 
-    for (i=0; i<nprocs_recv; i++) ompi_datatype_destroy(recv_types+i);
-    if (NULL != recv_types){
-	free(recv_types);
-	recv_types = NULL;
-    }
-
     ret = ompi_request_wait_all (nprocs_send+nprocs_recv,
 				 requests,
 				 MPI_STATUS_IGNORE);
 
 
-    if ( NULL != requests ){
-	free(requests);
-    }
-
 #if OMPIO_FCOLL_WANT_TIME_BREAKDOWN
     end_comm_time = MPI_Wtime();
     comm_time += (end_comm_time - start_comm_time);
 #endif
 
 exit:
+    for (i=0; i<nprocs_recv; i++) ompi_datatype_destroy(recv_types+i);
+    free (recv_types);
+
+    free (requests);
+    if (send_buf) {
+        for (i=0; i < fh->f_size; i++){
+            free (send_buf[i]);
+        }
+
+        free (send_buf);
+    }
+
     return ret;
 }
 

ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -12,6 +13,8 @@
  * Copyright (c) 2008-2011 University of Houston. All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -369,7 +372,7 @@ int mca_fcoll_two_phase_calc_my_requests (mca_io_ompio_file_t *fh,
 
     *count_my_req_per_proc_ptr = (int*)malloc(fh->f_size*sizeof(int));
 
-    if ( NULL == count_my_req_per_proc_ptr ){
+    if ( NULL == *count_my_req_per_proc_ptr ){
 	return OMPI_ERR_OUT_OF_RESOURCE;
     }