Map the stack guard page with max protection on NetBSD

On NetBSD the initial mmap() protection of a mapping can not be made
less restrictive with mprotect().

So when mapping a stack guard page, use the maximum protection
we ever want to use, then mprotect() it to the permission we
want it to have initially.

1 files changed, 16 insertions, 4 deletions

diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
index 9e388808030..f32016ce1d6 100644
--- a/src/libstd/sys/unix/thread.rs
+++ b/src/libstd/sys/unix/thread.rs
@@ -326,11 +326,23 @@ pub mod guard {
             // Reallocate the last page of the stack.
             // This ensures SIGBUS will be raised on
             // stack overflow.
-            let result = mmap(stackaddr, PAGE_SIZE, PROT_NONE,
-                              MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
+            if cfg!(target_os = "netbsd") {
+                let result = mmap(stackaddr, PAGE_SIZE, PROT_READ | PROT_WRITE,
+                                   MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
+                if result != stackaddr || result == MAP_FAILED {
+                    panic!("failed to allocate a guard page");
+                }
+                let result = mprotect(stackaddr, PAGE_SIZE, 0);
 
-            if result != stackaddr || result == MAP_FAILED {
-                panic!("failed to allocate a guard page");
+                if result != 0 {
+                    panic!("unable to protect the guard page");
+                }
+            } else {
+                let result = mmap(stackaddr, PAGE_SIZE, PROT_NONE,
+                                  MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0);
+                if result != stackaddr || result == MAP_FAILED {
+                    panic!("failed to allocate a guard page");
+                }
             }
 
             let guardaddr = stackaddr as usize;