From: Russ Cox <rsc@golang.org>
Date: Fri, 11 Feb 2011 19:32:34 +0000 (-0500)
Subject: runtime: check that SysReserve returns aligned memory
X-Git-Tag: weekly.2011-02-15~24
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=48535ae3f10e685f2385b67dbcc3037e8c297b5f;p=gostls13.git

runtime: check that SysReserve returns aligned memory

R=iant, iant2
CC=golang-dev
https://golang.org/cl/4180043
---

diff --git a/src/pkg/runtime/malloc.goc b/src/pkg/runtime/malloc.goc
index 18652d71a6..70b85d68d7 100644
--- a/src/pkg/runtime/malloc.goc
+++ b/src/pkg/runtime/malloc.goc
@@ -297,6 +297,9 @@ runtime·mallocinit(void)
 		if(p == nil)
 			runtime·throw("runtime: cannot reserve arena virtual address space");
 	}
+	if((uintptr)p & (((uintptr)1<<PageShift)-1))
+		runtime·throw("runtime: SysReserve returned unaligned address");
+
 	runtime·mheap.bitmap = p;
 	runtime·mheap.arena_start = p + bitmap_size;
 	runtime·mheap.arena_used = runtime·mheap.arena_start;