Skip to content

v4.1.x: osc/rdma: fix data integrity and memleak issue in rdma get_accumulate #10654

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
jsquyres merged 1 commit into from
Aug 12, 2022
Merged

v4.1.x: osc/rdma: fix data integrity and memleak issue in rdma get_accumulate #10654

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: 4 additions & 2 deletions ompi/mca/osc/rdma/osc_rdma_accumulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,14 @@ static inline int ompi_osc_rdma_gacc_amo (ompi_osc_rdma_module_t *module, ompi_o
{
const bool use_amo = module->acc_use_amo;
const size_t dt_size = datatype->super.size;
void *result_start = result;
void *to_free = NULL;
int ret;

OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "using network atomics for accumulate operation with count %d", count);

if (NULL == result) {
to_free = result = malloc (request->len);
to_free = result_start = result = malloc (request->len);
if (OPAL_UNLIKELY(NULL == result)) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
Expand Down Expand Up @@ -297,14 +298,15 @@ static inline int ompi_osc_rdma_gacc_amo (ompi_osc_rdma_module_t *module, ompi_o
target_address += dt_size;
++i;
} else if (OPAL_UNLIKELY(OMPI_ERR_NOT_SUPPORTED == ret)) {
free(to_free);
return OMPI_ERR_NOT_SUPPORTED;
}
}

if (NULL != result_convertor) {
/* result buffer is not necessarily contiguous. use the opal datatype engine to
* copy the data over in this case */
struct iovec iov = {.iov_base = result, .iov_len = request->len};
struct iovec iov = {.iov_base = result_start, .iov_len = request->len};
uint32_t iov_count = 1;
size_t size = request->len;

Expand Down