Merge pull request #11221 from jjhursey/v5-cp-11199

janjust · web-flow · commit efb1beb32d65 · 2022-12-20T09:09:41.000-06:00
v5: Fix missing lock release in oshmem_proc_group_create
diff --git a/oshmem/proc/proc.c b/oshmem/proc/proc.c
@@ -212,6 +212,7 @@ oshmem_group_t* oshmem_proc_group_create(int pe_start, int pe_stride, int pe_siz
     /* allocate an array */
     group->proc_vpids = (opal_vpid_t *) malloc(pe_size * sizeof(group->proc_vpids[0]));
     if (NULL == group->proc_vpids) {
+        OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
         return NULL;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ oshmem_group_t* oshmem_proc_group_create(int pe_start, int pe_stride, int pe_siz`
`212`	`212`	`/* allocate an array */`
`213`	`213`	`group->proc_vpids = (opal_vpid_t ) malloc(pe_size sizeof(group->proc_vpids[0]));`
`214`	`214`	`if (NULL == group->proc_vpids) {`
	`215`	`+ OPAL_THREAD_UNLOCK(&oshmem_proc_lock);`
`215`	`216`	`return NULL;`
`216`	`217`	`}`
`217`	`218`