OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20920 from piyo/issue-20853 

Give mmap a page-aligned stack start address

Reviewed-by: Aatch
This commit is contained in:
bors 2015-01-12 00:21:28 +00:00
parent a1a34a35b2 0568464d36
commit 1f1e18972e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libstd/sys/unix/thread.rs
View File

@ -93,7 +93,19 @@ pub mod guard {
PAGE_SIZE = psize as uint;
let stackaddr = get_stack_start();
let mut stackaddr = get_stack_start();
// Ensure stackaddr is page aligned! A parent process might
// have reset RLIMIT_STACK to be non-page aligned. The
// pthread_attr_getstack() reports the usable stack area
// stackaddr < stackaddr + stacksize, so if stackaddr is not
// page-aligned, calculate the fix such that stackaddr <
// new_page_aligned_stackaddr < stackaddr + stacksize
let remainder = (stackaddr as usize) % (PAGE_SIZE as usize);
if remainder != 0 {
stackaddr = ((stackaddr as usize) + (PAGE_SIZE as usize) - remainder)
as *mut libc::c_void;
}
// Rellocate the last page of the stack.
// This ensures SIGBUS will be raised on