Merge pull request #11060 from jsquyres/pr/cid-fixes

A variety of CID fixes

Author: jsquyres

ompi/instance/instance.c

@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2018-2022 Triad National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -818,10 +819,10 @@ int ompi_mpi_instance_init (int ts_level,  opal_info_t *info, ompi_errhandler_t
     new_instance = OBJ_NEW(ompi_instance_t);
     if (OPAL_UNLIKELY(NULL == new_instance)) {
         if (0 == opal_atomic_add_fetch_32 (&ompi_instance_count, -1)) {
-            ret = ompi_mpi_instance_finalize_common ();
-            if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) {
-                opal_mutex_unlock (&instance_lock);
-            }
+            // We can't do anything if an error occurs here because
+            // we're already in an error path, so don't even bother to
+            // look at the return value.
+            (void) ompi_mpi_instance_finalize_common ();
         }
         opal_mutex_unlock (&instance_lock);
         return OMPI_ERR_OUT_OF_RESOURCE;

ompi/mca/coll/base/coll_base_allreduce.c

@@ -17,6 +17,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018      Siberian State University of Telecommunications
  *                         and Information Science. All rights reserved.
+ * Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -982,7 +983,9 @@ int ompi_coll_base_allreduce_intra_redscat_allgather(
 
     /* Find nearest power-of-two less than or equal to comm_size */
     int nsteps = opal_hibit(comm_size, comm->c_cube_dim + 1);   /* ilog2(comm_size) */
-    assert(nsteps >= 0);
+    if (-1 == nsteps) {
+        return MPI_ERR_ARG;
+    }
     int nprocs_pof2 = 1 << nsteps;                              /* flp2(comm_size) */
 
     if (count < nprocs_pof2 || !ompi_op_is_commute(op)) {

ompi/mca/coll/base/coll_base_reduce.c

@@ -17,6 +17,7 @@
  * Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
  * Copyright (c) 2018      Siberian State University of Telecommunications
  *                         and Information Science. All rights reserved.
+ * Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -812,7 +813,9 @@ int ompi_coll_base_reduce_intra_redscat_gather(
 
     /* Find nearest power-of-two less than or equal to comm_size */
     int nsteps = opal_hibit(comm_size, comm->c_cube_dim + 1);   /* ilog2(comm_size) */
-    assert(nsteps >= 0);
+    if (-1 == nsteps) {
+        return MPI_ERR_ARG;
+    }
     int nprocs_pof2 = 1 << nsteps;                              /* flp2(comm_size) */
 
     if (nprocs_pof2 < 2 || count < nprocs_pof2 || !ompi_op_is_commute(op)) {

ompi/mca/coll/basic/coll_basic_reduce_scatter_block.c

@@ -15,6 +15,7 @@
  * Copyright (c) 2014-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2022      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -174,9 +175,5 @@ mca_coll_basic_reduce_scatter_block_inter(const void *sbuf, void *rbuf, int rcou
         free(tmpbuf);
     }
 
-    if (NULL != tmpbuf2) {
-        free(tmpbuf2);
-    }
-
     return err;
 }

opal/mca/base/mca_base_component_repository.c

@@ -211,6 +211,9 @@ int mca_base_component_repository_add(const char *path)
     path_to_use = strdup(path);
 
     dir = strtok_r(path_to_use, sep, &ctx);
+    if (NULL == dir) {
+        goto done;
+    }
     do {
         if ((0 == strcmp(dir, "USER_DEFAULT") || 0 == strcmp(dir, "USR_DEFAULT"))
             && NULL != mca_base_user_default_path) {
@@ -224,6 +227,7 @@ int mca_base_component_repository_add(const char *path)
         }
     } while (NULL != (dir = strtok_r(NULL, sep, &ctx)));
 
+ done:
     free(path_to_use);
 
 #endif /* OPAL_HAVE_DL_SUPPORT */

opal/mca/mpool/hugepage/mpool_hugepage_component.c

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      Voltaire. All rights reserved.
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2022 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2016 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2016      Intel, Inc. All rights reserved.
@@ -238,9 +238,8 @@ static void mca_mpool_hugepage_find_hugepages(void)
         }
 
         tok = strtok_r(opts, ",", &ctx);
-
         do {
-            if (0 == strncmp(tok, "pagesize", 8)) {
+            if (NULL != tok && 0 == strncmp(tok, "pagesize", 8)) {
                 break;
             }
             tok = strtok_r(NULL, ",", &ctx);

opal/util/ethtool.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2016      Karol Mroz.  All rights reserved.
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016-2022 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -63,7 +63,7 @@ unsigned int opal_ethtool_get_speed(const char *if_name)
     }
 
     memset(&ifr, 0, sizeof(struct ifreq));
-    opal_string_copy(ifr.ifr_name, if_name, OPAL_IF_NAMESIZE);
+    opal_string_copy(ifr.ifr_name, if_name, IF_NAMESIZE);
     ifr.ifr_data = (char *) &edata;
 
     if (ioctl(sockfd, SIOCETHTOOL, &ifr) < 0) {