From: Dmitriy Vyukov <dvyukov@google.com>
Date: Mon, 10 Jun 2013 18:59:39 +0000 (+0400)
Subject: runtime: fix one-time memory leak on linux
X-Git-Tag: go1.2rc2~1285
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fd41926347c6f1cf1cc06079050912b9c48a1f09;p=gostls13.git

runtime: fix one-time memory leak on linux
Update #5641.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/10144043
---

diff --git a/src/pkg/runtime/mem_linux.c b/src/pkg/runtime/mem_linux.c
index 1bae755faf..bacd568d9e 100644
--- a/src/pkg/runtime/mem_linux.c
+++ b/src/pkg/runtime/mem_linux.c
@@ -95,14 +95,17 @@ runtime·SysReserve(void *v, uintptr n)
 	// Only user-mode Linux (UML) rejects these requests.
 	if(sizeof(void*) == 8 && (uintptr)v >= 0xffffffffU) {
 		p = mmap_fixed(v, 64<<10, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
-		if (p != v)
+		if (p != v) {
+			if(p >= (void*)4096)
+				runtime·munmap(p, 64<<10);
 			return nil;
+		}
 		runtime·munmap(p, 64<<10);
 		return v;
 	}
-	
+
 	p = runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
-	if((uintptr)p < 4096 || -(uintptr)p < 4096)
+	if((uintptr)p < 4096)
 		return nil;
 	return p;
 }