Skip to content
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

Prevent internal errno setting escaping to the client. #754

Merged
merged 1 commit into from
Feb 28, 2025
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
10 changes: 8 additions & 2 deletions src/snmalloc/pal/pal_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ namespace snmalloc

static void notify_not_using(void* p, size_t size) noexcept
{
KeepErrno k;
SNMALLOC_ASSERT(is_aligned_block<page_size>(p, size));

// Fill memory so that when we switch the pages back on we don't make
Expand All @@ -147,6 +148,7 @@ namespace snmalloc
*/
static void notify_do_dump(void* p, size_t size) noexcept
{
KeepErrno k;
madvise(p, size, MADV_DODUMP);
}

Expand All @@ -155,11 +157,14 @@ namespace snmalloc
*/
static void notify_do_not_dump(void* p, size_t size) noexcept
{
KeepErrno k;
madvise(p, size, MADV_DONTDUMP);
}

static uint64_t get_entropy64()
{
KeepErrno k;

// TODO: If the system call fails then the POSIX PAL calls libc
// functions that can require malloc, which may result in deadlock.

Expand Down Expand Up @@ -249,7 +254,7 @@ namespace snmalloc
template<class T>
static void wait_on_address(stl::Atomic<T>& addr, T expected)
{
int backup = errno;
KeepErrno k;
static_assert(
sizeof(T) == sizeof(WaitingWord) && alignof(T) == alignof(WaitingWord),
"T must be the same size and alignment as WaitingWord");
Expand All @@ -273,12 +278,12 @@ namespace snmalloc
syscall(
SYS_futex, &addr, FUTEX_WAIT_PRIVATE, expected, nullptr, nullptr, 0);
}
errno = backup;
}

template<class T>
static void notify_one_on_address(stl::Atomic<T>& addr)
{
KeepErrno k;
static_assert(
sizeof(T) == sizeof(WaitingWord) && alignof(T) == alignof(WaitingWord),
"T must be the same size and alignment as WaitingWord");
Expand All @@ -288,6 +293,7 @@ namespace snmalloc
template<class T>
static void notify_all_on_address(stl::Atomic<T>& addr)
{
KeepErrno k;
static_assert(
sizeof(T) == sizeof(WaitingWord) && alignof(T) == alignof(WaitingWord),
"T must be the same size and alignment as WaitingWord");
Expand Down
Loading