Skip to content

[v4.1.x] btl/ofi: fix memory leaks in error handling path #8318

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
Jan 4, 2021
Merged

[v4.1.x] btl/ofi: fix memory leaks in error handling path #8318

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions opal/mca/btl/ofi/btl_ofi_atomics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,10 @@ int mca_btl_ofi_afop (struct mca_btl_base_module_t *btl, struct mca_btl_base_end
fi_datatype, fi_op, &comp->comp_ctx);

if (rc == -FI_EAGAIN) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
return OPAL_ERR_OUT_OF_RESOURCE;
} else if (rc < 0) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
BTL_ERROR(("fi_fetch_atomic failed with rc=%d (%s)", rc, fi_strerror(-rc)));
MCA_BTL_OFI_ABORT();
}
Expand Down Expand Up @@ -125,8 +127,10 @@ int mca_btl_ofi_aop (struct mca_btl_base_module_t *btl, mca_btl_base_endpoint_t
fi_datatype, fi_op, &comp->comp_ctx);

if (rc == -FI_EAGAIN) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
return OPAL_ERR_OUT_OF_RESOURCE;
} else if (rc < 0) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
BTL_ERROR(("fi_atomic failed with rc=%d (%s)", rc, fi_strerror(-rc)));
MCA_BTL_OFI_ABORT();
}
Expand Down Expand Up @@ -181,8 +185,10 @@ int mca_btl_ofi_acswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_e
&comp->comp_ctx);

if (rc == -FI_EAGAIN) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
return OPAL_ERR_OUT_OF_RESOURCE;
} else if (rc < 0) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
BTL_ERROR(("fi_compare_atomic failed with rc=%d (%s)", rc, fi_strerror(-rc)));
MCA_BTL_OFI_ABORT();
}
Expand Down
4 changes: 4 additions & 0 deletions opal/mca/btl/ofi/btl_ofi_rdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ int mca_btl_ofi_get (mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoi
&comp->comp_ctx); /* completion context */

if (-FI_EAGAIN == rc) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
return OPAL_ERR_OUT_OF_RESOURCE;
}

if (0 != rc) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
BTL_ERROR(("fi_read failed with %d:%s", rc, fi_strerror(-rc)));
MCA_BTL_OFI_ABORT();
}
Expand Down Expand Up @@ -133,10 +135,12 @@ int mca_btl_ofi_put (mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoi
&comp->comp_ctx); /* completion context */

if (-FI_EAGAIN == rc) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
return OPAL_ERR_OUT_OF_RESOURCE;
}

if (0 != rc) {
opal_free_list_return(comp->base.my_list, (opal_free_list_item_t*) comp);
BTL_ERROR(("fi_write failed with %d:%s", rc, fi_strerror(-rc)));
MCA_BTL_OFI_ABORT();
}
Expand Down