Skip to content

Verify trackers's parameters in trackingInitialize() #420

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
Apr 9, 2024
+9 −4
Merged

Verify trackers's parameters in trackingInitialize() #420

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
13 changes: 9 additions & 4 deletions src/provider/provider_tracking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ static umf_result_t trackingAlloc(void *hProvider, size_t size,
(umf_tracking_memory_provider_t *)hProvider;
umf_result_t ret = UMF_RESULT_SUCCESS;

if (!p->hUpstream) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
assert(p->hUpstream);

ret = umfMemoryProviderAlloc(p->hUpstream, size, alignment, ptr);
if (ret != UMF_RESULT_SUCCESS || !*ptr) {
Expand Down Expand Up @@ -372,6 +370,11 @@ static umf_result_t trackingInitialize(void *params, void **ret) {
}

*provider = *((umf_tracking_memory_provider_t *)params);
if (provider->hUpstream == NULL || provider->hTracker == NULL ||
provider->pool == NULL || provider->ipcCache == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

*ret = provider;
return UMF_RESULT_SUCCESS;
}
Expand Down Expand Up @@ -586,13 +589,15 @@ static umf_result_t trackingOpenIpcHandle(void *provider, void *providerIpcData,
(umf_tracking_memory_provider_t *)provider;
umf_result_t ret = UMF_RESULT_SUCCESS;

assert(p->hUpstream);

ret = umfMemoryProviderOpenIPCHandle(p->hUpstream, providerIpcData, ptr);
if (ret != UMF_RESULT_SUCCESS) {
return ret;
}
size_t bufferSize = getDataSizeFromIpcHandle(providerIpcData);
ret = umfMemoryTrackerAdd(p->hTracker, p->pool, *ptr, bufferSize);
if (ret != UMF_RESULT_SUCCESS && p->hUpstream) {
if (ret != UMF_RESULT_SUCCESS) {
if (umfMemoryProviderCloseIPCHandle(p->hUpstream, *ptr)) {
// TODO: LOG
}
Expand Down