Skip to content

Fix missing unlock() in Coarse Provider #781

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.

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
Changes from all commits
Commits
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
31 changes: 15 additions & 16 deletions src/provider/provider_coarse.c
Original file line number Diff line number Diff line change
Expand Up @@ -1283,43 +1283,42 @@ static umf_result_t coarse_memory_provider_alloc(void *provider, size_t size,

if (coarse_provider->upstream_memory_provider == NULL) {
LOG_ERR("out of memory - no upstream memory provider given");
return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
umf_result = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
goto err_unlock;
}

umfMemoryProviderAlloc(coarse_provider->upstream_memory_provider, size,
alignment, resultPtr);
if (*resultPtr == NULL) {
LOG_ERR("out of memory - upstream memory provider allocation failed");
return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
umf_result = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
goto err_unlock;
}

ASSERT_IS_ALIGNED(((uintptr_t)(*resultPtr)), alignment);

umf_result = coarse_add_upstream_block(coarse_provider, *resultPtr, size);
if (umf_result != UMF_RESULT_SUCCESS) {
return umf_result;
if (!coarse_provider->disable_upstream_provider_free) {
umfMemoryProviderFree(coarse_provider->upstream_memory_provider,
*resultPtr, size);
}
goto err_unlock;
}

LOG_DEBUG("coarse_ALLOC (upstream) %zu used %zu alloc %zu", size,
coarse_provider->used_size, coarse_provider->alloc_size);

umf_result = UMF_RESULT_SUCCESS;

err_unlock:
assert(debug_check(coarse_provider));

if (utils_mutex_unlock(&coarse_provider->lock) != 0) {
LOG_ERR("unlocking the lock failed");
umf_result = UMF_RESULT_ERROR_UNKNOWN;
goto unlock_error;
}

return UMF_RESULT_SUCCESS;

unlock_error:
coarse_ravl_rm(coarse_provider->all_blocks, *resultPtr);
coarse_ravl_rm(coarse_provider->upstream_blocks, *resultPtr);

if (!coarse_provider->disable_upstream_provider_free) {
umfMemoryProviderFree(coarse_provider->upstream_memory_provider,
*resultPtr, size);
if (umf_result == UMF_RESULT_SUCCESS) {
umf_result = UMF_RESULT_ERROR_UNKNOWN;
}
}

return umf_result;
Expand Down
Loading