oshmem: Avoid double free of the process locality bitmap

sb17v · artpol84 · sb17v · commit ad01c4a985f0 · 2021-08-31T10:16:46.000-07:00
Fixes a bug introduced in PR #9112. Ensure OBJ_DESTRUCT for _oshmem_local_vpids is invoked only once Co-authored-by: Artem Y. Polyakov <artemp@nvidia.com> Signed-off-by: Artem Polyakov <artemp@nvidia.com> Signed-off-by: Subhadeep Bhattacharya <subhadeepb@nvidia.com>
diff --git a/oshmem/proc/proc.c b/oshmem/proc/proc.c
@@ -179,6 +179,7 @@ int oshmem_proc_group_finalize(void)
         }
     }
 
+    OBJ_DESTRUCT(&_oshmem_local_vpids);
     OBJ_DESTRUCT(&oshmem_group_array);
 
     oshmem_group_cache_destroy();
@@ -265,8 +266,6 @@ oshmem_proc_group_destroy_internal(oshmem_group_t* group, int scoll_unselect)
         mca_scoll_base_group_unselect(group);
     }
 
-    /* Destroy proc array */
-    OBJ_DESTRUCT(&_oshmem_local_vpids);
     if (group->proc_vpids) {
         free(group->proc_vpids);
     }

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ int oshmem_proc_group_finalize(void)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
	`182`	`+ OBJ_DESTRUCT(&_oshmem_local_vpids);`
`182`	`183`	`OBJ_DESTRUCT(&oshmem_group_array);`
`183`	`184`
`184`	`185`	`oshmem_group_cache_destroy();`
`@@ -265,8 +266,6 @@ oshmem_proc_group_destroy_internal(oshmem_group_t* group, int scoll_unselect)`
`265`	`266`	`mca_scoll_base_group_unselect(group);`
`266`	`267`	`}`
`267`	`268`
`268`		`- /* Destroy proc array */`
`269`		`- OBJ_DESTRUCT(&_oshmem_local_vpids);`
`270`	`269`	`if (group->proc_vpids) {`
`271`	`270`	`free(group->proc_vpids);`
`272`	`271`	`}`