From c42b061770e036ddd8fc60c1d49566a6651a3903 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2010 09:24:04 -0700
Subject: [PATCH] --- yaml --- r: 209181 b: refs/heads/master c:
 5528f9132cf65d4d892bcbc5684c61e7822b21e9 h: refs/heads/master i:   209179:
 e0c182d4c05ac59447636accb74eccfb3bc746e6 v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a220f4b150ca..21b6cc085ada 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320b2b8de12698082609ebbc1a17165727f4c893
+refs/heads/master: 5528f9132cf65d4d892bcbc5684c61e7822b21e9
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 9606ceb3c165..9b3b73f4ae9c 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2792,8 +2792,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	spinlock_t *ptl;
 	pte_t entry;
 
-	if (check_stack_guard_page(vma, address) < 0)
+	if (check_stack_guard_page(vma, address) < 0) {
+		pte_unmap(page_table);
 		return VM_FAULT_SIGBUS;
+	}
 
 	if (!(flags & FAULT_FLAG_WRITE)) {
 		entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),