Skip to content

Fix os_get_ipc_handle() - add protection and visibility #873

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
Nov 7, 2024
Merged

Fix os_get_ipc_handle() - add protection and visibility #873

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
8 changes: 6 additions & 2 deletions src/provider/provider_os_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,8 @@ typedef struct os_ipc_data_t {
int fd;
size_t fd_offset;
size_t size;
unsigned protection; // combination of OS-specific protection flags
unsigned visibility; // memory visibility mode
// shm_name is a Flexible Array Member because it is optional and its size
// varies on the Shared Memory object name
size_t shm_name_len;
Expand Down Expand Up @@ -1200,6 +1202,8 @@ static umf_result_t os_get_ipc_handle(void *provider, const void *ptr,
os_ipc_data->pid = utils_getpid();
os_ipc_data->fd_offset = (size_t)value - 1;
os_ipc_data->size = size;
os_ipc_data->protection = os_provider->protection;
os_ipc_data->visibility = os_provider->visibility;
os_ipc_data->shm_name_len = strlen(os_provider->shm_name);
if (os_ipc_data->shm_name_len > 0) {
strncpy(os_ipc_data->shm_name, os_provider->shm_name,
Expand Down Expand Up @@ -1278,8 +1282,8 @@ static umf_result_t os_open_ipc_handle(void *provider, void *providerIpcData,
}
}

*ptr = utils_mmap(NULL, os_ipc_data->size, os_provider->protection,
os_provider->visibility, fd, os_ipc_data->fd_offset);
*ptr = utils_mmap(NULL, os_ipc_data->size, os_ipc_data->protection,
os_ipc_data->visibility, fd, os_ipc_data->fd_offset);
Copy link
Contributor

@bratpiorka bratpiorka Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a test to check the expected properties of the mapped memory retrieved from the IPC handle?

Copy link
Contributor Author

@ldorau ldorau Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure? ;-)

if (*ptr == NULL) {
os_store_last_native_error(UMF_OS_RESULT_ERROR_ALLOC_FAILED, errno);
LOG_PERR("memory mapping failed");
Expand Down
Loading