Skip to content

Fix issue in trackingGetIpcHandle #795

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

Closed
wants to merge 2 commits into from
Closed

Fix issue in trackingGetIpcHandle #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59ea3b7
Fix issue in trackingGetIpcHandle
vinser52 Oct 13, 2024
8ceffe8
Improve logging in OS memory provider
vinser52 Oct 13, 2024
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
19 changes: 18 additions & 1 deletion src/provider/provider_os_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,12 +1179,17 @@ static umf_result_t os_get_ipc_handle_size(void *provider, size_t *size) {
static umf_result_t os_get_ipc_handle(void *provider, const void *ptr,
size_t size, void *providerIpcData) {
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
LOG_ERR(
"Some argument is NULL, provider=%p, ptr=%p, providerIpcData=%p",
provider, ptr, providerIpcData);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

os_memory_provider_t *os_provider = (os_memory_provider_t *)provider;
if (!os_provider->IPC_enabled) {
LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED")
LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED, ptr=%p, "
"size=%lu",
ptr, size);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

Expand Down Expand Up @@ -1213,6 +1218,9 @@ static umf_result_t os_get_ipc_handle(void *provider, const void *ptr,

static umf_result_t os_put_ipc_handle(void *provider, void *providerIpcData) {
if (provider == NULL || providerIpcData == NULL) {
LOG_ERR("provider or providerIpcData are NULL, provider=%p, "
"providerIpcData=%p",
provider, providerIpcData);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

Expand All @@ -1225,19 +1233,28 @@ static umf_result_t os_put_ipc_handle(void *provider, void *providerIpcData) {
os_ipc_data_t *os_ipc_data = (os_ipc_data_t *)providerIpcData;

if (os_ipc_data->pid != utils_getpid()) {
LOG_ERR("invalid PID, os_ipc_data->pid = %d", os_ipc_data->pid);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

size_t shm_name_len = strlen(os_provider->shm_name);
if (shm_name_len > 0) {
if (os_ipc_data->shm_name_len != shm_name_len) {
LOG_ERR("invalid shm_name_len, os_ipc_data->shm_name_len=%lu, "
"expected shm_name_len=%lu",
os_ipc_data->shm_name_len, shm_name_len);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
} else if (strncmp(os_ipc_data->shm_name, os_provider->shm_name,
shm_name_len)) {
LOG_ERR("invalid shm_name, os_ipc_data->shm_name=%s, "
"os_provider->shm_name=%s",
os_ipc_data->shm_name, os_provider->shm_name);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
} else {
if (os_ipc_data->fd != os_provider->fd) {
LOG_ERR("invalid fd, os_ipc_data->fd=%d, os_provider->fd=%d",
os_ipc_data->fd, os_provider->fd);
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/provider/provider_tracking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,8 @@ static umf_result_t trackingGetIpcHandle(void *provider, const void *ptr,
// 2. critnib failed to allocate memory internally. We need
// to cleanup and return corresponding error.
umf_ba_global_free(cache_value);
ret = umfMemoryProviderPutIPCHandle(p->hUpstream,
providerIpcData);
ret = umfMemoryProviderPutIPCHandle(
p->hUpstream, cache_value->providerIpcData);
if (ret != UMF_RESULT_SUCCESS) {
LOG_ERR("upstream provider is failed to put IPC handle");
return ret;
Expand Down
Loading