rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #32726 - asomers:master, r=alexcrichton

Browse Source 
Fix stack overflow detection on FreeBSD
This commit is contained in:
bors
2016-04-13 01:20:15 -07:00
parent 4b71f8d141 78ea972b9f
commit 7d4d3cb0be
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/sys/unix/stack_overflow.rs
View File

@@ -64,7 +64,7 @@ mod imp {
unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> usize { unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> usize {
#[repr(C)] #[repr(C)]
struct siginfo_t { struct siginfo_t {
a: [libc::c_int; 3], // si_signo, si_code, si_errno, a: [libc::c_int; 3], // si_signo, si_errno, si_code
si_addr: *mut libc::c_void, si_addr: *mut libc::c_void,
} }

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

@@ -164,6 +164,7 @@ impl Drop for Thread {
} }
#[cfg(all(not(all(target_os = "linux", not(target_env = "musl"))), #[cfg(all(not(all(target_os = "linux", not(target_env = "musl"))),
not(target_os = "freebsd"),
not(target_os = "macos"), not(target_os = "macos"),
not(target_os = "bitrig"), not(target_os = "bitrig"),
not(all(target_os = "netbsd", not(target_vendor = "rumprun"))), not(all(target_os = "netbsd", not(target_vendor = "rumprun"))),
@@ -177,6 +178,7 @@ pub mod guard {
#[cfg(any(all(target_os = "linux", not(target_env = "musl")), #[cfg(any(all(target_os = "linux", not(target_env = "musl")),
target_os = "freebsd",
target_os = "macos", target_os = "macos",
target_os = "bitrig", target_os = "bitrig",
all(target_os = "netbsd", not(target_vendor = "rumprun")), all(target_os = "netbsd", not(target_vendor = "rumprun")),
@@ -199,12 +201,17 @@ pub mod guard {
current().map(|s| s as *mut libc::c_void) current().map(|s| s as *mut libc::c_void)
} }
#[cfg(any(target_os = "linux", target_os = "android", target_os = "netbsd"))] #[cfg(any(target_os = "android", target_os = "freebsd",
target_os = "linux", target_os = "netbsd"))]
unsafe fn get_stack_start() -> Option<*mut libc::c_void> { unsafe fn get_stack_start() -> Option<*mut libc::c_void> {
let mut ret = None; let mut ret = None;
let mut attr: libc::pthread_attr_t = ::mem::zeroed(); let mut attr: libc::pthread_attr_t = ::mem::zeroed();
assert_eq!(libc::pthread_attr_init(&mut attr), 0); assert_eq!(libc::pthread_attr_init(&mut attr), 0);
if libc::pthread_getattr_np(libc::pthread_self(), &mut attr) == 0 { #[cfg(target_os = "freebsd")]
let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr);
#[cfg(not(target_os = "freebsd"))]
let e = libc::pthread_getattr_np(libc::pthread_self(), &mut attr);
if e == 0 {
let mut stackaddr = ::ptr::null_mut(); let mut stackaddr = ::ptr::null_mut();
let mut stacksize = 0; let mut stacksize = 0;
assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr,
@@ -248,7 +255,11 @@ pub mod guard {
panic!("failed to allocate a guard page"); panic!("failed to allocate a guard page");
} }
let offset = if cfg!(target_os = "linux") {2} else {1}; let offset = if cfg!(any(target_os = "linux", target_os = "freebsd")) {
2
} else {
1
};
Some(stackaddr as usize + offset * psize) Some(stackaddr as usize + offset * psize)
} }
@@ -282,12 +293,17 @@ pub mod guard {
}) })
} }
#[cfg(any(target_os = "linux", target_os = "android", target_os = "netbsd"))] #[cfg(any(target_os = "android", target_os = "freebsd",
target_os = "linux", target_os = "netbsd"))]
pub unsafe fn current() -> Option<usize> { pub unsafe fn current() -> Option<usize> {
let mut ret = None; let mut ret = None;
let mut attr: libc::pthread_attr_t = ::mem::zeroed(); let mut attr: libc::pthread_attr_t = ::mem::zeroed();
assert_eq!(libc::pthread_attr_init(&mut attr), 0); assert_eq!(libc::pthread_attr_init(&mut attr), 0);
if libc::pthread_getattr_np(libc::pthread_self(), &mut attr) == 0 { #[cfg(target_os = "freebsd")]
let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr);
#[cfg(not(target_os = "freebsd"))]
let e = libc::pthread_getattr_np(libc::pthread_self(), &mut attr);
if e == 0 {
let mut guardsize = 0; let mut guardsize = 0;
assert_eq!(libc::pthread_attr_getguardsize(&attr, &mut guardsize), 0); assert_eq!(libc::pthread_attr_getguardsize(&attr, &mut guardsize), 0);
if guardsize == 0 { if guardsize == 0 {
@@ -298,7 +314,9 @@ pub mod guard {
assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr,
&mut size), 0); &mut size), 0);
ret = if cfg!(target_os = "netbsd") { ret = if cfg!(target_os = "freebsd") {
Some(stackaddr as usize - guardsize as usize)
} else if cfg!(target_os = "netbsd") {
Some(stackaddr as usize) Some(stackaddr as usize)
} else { } else {
Some(stackaddr as usize + guardsize as usize) Some(stackaddr as usize + guardsize as usize)