Skip to content

Fix: size_fd has to be read under a lock #643

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
Jul 30, 2024
Merged

Fix: size_fd has to be read under a lock #643

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
19 changes: 10 additions & 9 deletions src/provider/provider_os_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,8 @@ static inline void assert_is_page_aligned(uintptr_t ptr, size_t page_size) {
static int os_mmap_aligned(void *hint_addr, size_t length, size_t alignment,
Copy link
Contributor

Choose a reason for hiding this comment

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

NIT: 12th argument to this function. This screams for refactor.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I will do that in a separate PR.

size_t page_size, int prot, int flag, int fd,
size_t max_fd_size, os_mutex_t *lock_fd,
void **out_addr, size_t *fd_size) {
void **out_addr, size_t *fd_size,
size_t *fd_offset) {
assert(out_addr);

size_t extended_length = length;
Expand All @@ -650,7 +651,7 @@ static int os_mmap_aligned(void *hint_addr, size_t length, size_t alignment,
extended_length += alignment;
}

size_t fd_offset = 0;
*fd_offset = 0;

if (fd > 0) {
if (util_mutex_lock(lock_fd)) {
Expand All @@ -664,12 +665,12 @@ static int os_mmap_aligned(void *hint_addr, size_t length, size_t alignment,
return -1;
}

fd_offset = *fd_size;
*fd_offset = *fd_size;
*fd_size += extended_length;
util_mutex_unlock(lock_fd);
}

void *ptr = os_mmap(hint_addr, extended_length, prot, flag, fd, fd_offset);
void *ptr = os_mmap(hint_addr, extended_length, prot, flag, fd, *fd_offset);
if (ptr == NULL) {
LOG_PDEBUG("memory mapping failed");
return -1;
Expand Down Expand Up @@ -912,14 +913,14 @@ static umf_result_t os_alloc(void *provider, size_t size, size_t alignment,
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

size_t fd_offset = os_provider->size_fd; // needed for critnib_insert()
size_t fd_offset; // needed for critnib_insert()

void *addr = NULL;
errno = 0;
ret = os_mmap_aligned(NULL, size, alignment, page_size,
os_provider->protection, os_provider->visibility,
os_provider->fd, os_provider->max_size_fd,
&os_provider->lock_fd, &addr, &os_provider->size_fd);
ret = os_mmap_aligned(
NULL, size, alignment, page_size, os_provider->protection,
os_provider->visibility, os_provider->fd, os_provider->max_size_fd,
&os_provider->lock_fd, &addr, &os_provider->size_fd, &fd_offset);
if (ret) {
os_store_last_native_error(UMF_OS_RESULT_ERROR_ALLOC_FAILED, 0);
LOG_ERR("memory allocation failed");
Expand Down
Loading