Skip to content

unix: break stack_overflow::install_main_guard into smaller fn #127845

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
bors merged 4 commits into from
Jul 18, 2024
Merged

unix: break stack_overflow::install_main_guard into smaller fn #127845

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17c70a9
unix: split stack_overflow::install_main_guard by os
workingjubilee Jul 17, 2024
e285c95
unix: stack_start_aligned is a safe fn
workingjubilee Jul 17, 2024
6ed563d
unix: clean up install_main_guard_freebsd
workingjubilee Jul 17, 2024
d47cb26
unix: unsafe-wrap install_main_guard_default
workingjubilee Jul 17, 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
Prev Previous commit
unix: unsafe-wrap install_main_guard_default
  • Loading branch information
@workingjubilee
workingjubilee committed Jul 17, 2024
commit d47cb26ddd6574de6c81caf9fdaadef1a108628a
21 changes: 12 additions & 9 deletions library/std/src/sys/pal/unix/stack_overflow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ mod imp {
Some(stackaddr - page_size..stackaddr)
}

#[forbid(unsafe_op_in_unsafe_fn)]
unsafe fn install_main_guard_default(page_size: usize) -> Option<Range<usize>> {
// Reallocate the last page of the stack.
// This ensures SIGBUS will be raised on
Expand All @@ -429,19 +430,21 @@ mod imp {
// read/write permissions and only then mprotect() it to
// no permissions at all. See issue #50313.
let stackptr = stack_start_aligned(page_size)?;
let result = mmap64(
stackptr,
page_size,
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-1,
0,
);
let result = unsafe {
mmap64(
stackptr,
page_size,
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-1,
0,
)
};
if result != stackptr || result == MAP_FAILED {
panic!("failed to allocate a guard page: {}", io::Error::last_os_error());
}

let result = mprotect(stackptr, page_size, PROT_NONE);
let result = unsafe { mprotect(stackptr, page_size, PROT_NONE) };
if result != 0 {
panic!("failed to protect the guard page: {}", io::Error::last_os_error());
}
Expand Down