Skip to content

v5.0.x: file.c: fix uninitialized mutex in MPI_File handle #12417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2024
Merged

v5.0.x: file.c: fix uninitialized mutex in MPI_File handle #12417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ompi/file/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ int ompi_file_open(struct ompi_communicator_t *comm, const char *filename,
return OMPI_ERR_OUT_OF_RESOURCE;
}

/* Create the mutex */
OBJ_CONSTRUCT(&file->f_lock, opal_mutex_t);

/* Select a module and actually open the file */

if (OMPI_SUCCESS != (ret = mca_io_base_file_select(file, NULL))) {
Expand All @@ -156,9 +153,6 @@ int ompi_file_open(struct ompi_communicator_t *comm, const char *filename,
*/
int ompi_file_close(ompi_file_t **file)
{

OBJ_DESTRUCT(&(*file)->f_lock);

(*file)->f_flags |= OMPI_FILE_ISCLOSED;
OBJ_RELEASE(*file);
*file = &ompi_mpi_file_null.file;
Expand Down Expand Up @@ -241,6 +235,7 @@ static void file_constructor(ompi_file_t *file)
file->f_comm = NULL;
file->f_filename = NULL;
file->f_amode = 0;
OBJ_CONSTRUCT(&file->f_lock, opal_mutex_t);

/* Initialize flags */

Expand Down Expand Up @@ -335,4 +330,6 @@ static void file_destructor(ompi_file_t *file)
opal_pointer_array_set_item(&ompi_file_f_to_c_table,
file->f_f_to_c_index, NULL);
}

OBJ_DESTRUCT(&(file->f_lock));
}