Merge pull request #5675 from jsquyres/pr/v3.1.x/fix-oob-ud-double-free

bwbarrett · web-flow · commit 10f96145031c · 2018-09-18T07:46:39.000-07:00
v3.1.x: oob/ud: remove double free
diff --git a/orte/mca/oob/ud/oob_ud_peer.c b/orte/mca/oob/ud/oob_ud_peer.c
@@ -6,6 +6,7 @@
  *                         and Technology (RIST). All rights reserved.
  *               2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2018      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -73,6 +74,7 @@ int mca_oob_ud_peer_update_with_uri (mca_oob_ud_peer_t *peer, const char *uri)
 
     rc = mca_oob_ud_parse_uri (uri, &qp_num, &lid, &port_num);
     if (ORTE_SUCCESS != rc) {
+        /* Only non-SUCCESS value is BAD_PARAM */
         return rc;
     }
 
@@ -107,8 +109,7 @@ int mca_oob_ud_peer_update_with_uri (mca_oob_ud_peer_t *peer, const char *uri)
         }
 
         if (NULL == peer->peer_ah) {
-            free (peer);
-            return ORTE_ERROR;
+            return ORTE_ERR_UNREACH;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`* and Technology (RIST). All rights reserved.`
`7`	`7`	`* 2014 Mellanox Technologies, Inc.`
`8`	`8`	`* All rights reserved.`
	`9`	`+ * Copyright (c) 2018 Cisco Systems, Inc. All rights reserved.`
`9`	`10`	`* $COPYRIGHT$`
`10`	`11`	`*`
`11`	`12`	`* Additional copyrights may follow`
`@@ -73,6 +74,7 @@ int mca_oob_ud_peer_update_with_uri (mca_oob_ud_peer_t peer, const char uri)`
`73`	`74`
`74`	`75`	`rc = mca_oob_ud_parse_uri (uri, &qp_num, &lid, &port_num);`
`75`	`76`	`if (ORTE_SUCCESS != rc) {`
	`77`	`+ /* Only non-SUCCESS value is BAD_PARAM */`
`76`	`78`	`return rc;`
`77`	`79`	`}`
`78`	`80`
`@@ -107,8 +109,7 @@ int mca_oob_ud_peer_update_with_uri (mca_oob_ud_peer_t peer, const char uri)`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`if (NULL == peer->peer_ah) {`
`110`		`- free (peer);`
`111`		`- return ORTE_ERROR;`
	`112`	`+ return ORTE_ERR_UNREACH;`
`112`	`113`	`}`
`113`	`114`	`}`
`114`	`115`