From: Rémy Oudompheng <oudomphe@phare.normalesup.org>
Date: Wed, 3 Apr 2013 15:30:20 +0000 (-0700)
Subject: bytes: don't leave mprotect-ed pages after unsafe test.
X-Git-Tag: go1.1rc2~207
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e42584effe7b648a8da345c67bbaef3f4053e228;p=gostls13.git

bytes: don't leave mprotect-ed pages after unsafe test.

Fixes inscrutable GC faults during testing.

R=golang-dev, bradfitz, dave, fullung
CC=golang-dev
https://golang.org/cl/8300044
---

diff --git a/src/pkg/bytes/equal_test.go b/src/pkg/bytes/equal_test.go
index a393d5e7de..1bf19a74b8 100644
--- a/src/pkg/bytes/equal_test.go
+++ b/src/pkg/bytes/equal_test.go
@@ -30,6 +30,8 @@ func TestEqualNearPageBoundary(t *testing.T) {
 	}
 	syscall.Mprotect(b[i-pagesize:i], 0)
 	syscall.Mprotect(b[i+pagesize:i+2*pagesize], 0)
+	defer syscall.Mprotect(b[i-pagesize:i], syscall.PROT_READ|syscall.PROT_WRITE)
+	defer syscall.Mprotect(b[i+pagesize:i+2*pagesize], syscall.PROT_READ|syscall.PROT_WRITE)
 
 	// both of these should fault
 	//pagesize += int(b[i-1])