From 013a233bb6e6a2bf77ce2c79fda22bdc45512d7f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 16 May 2012 15:19:20 +0100
Subject: [PATCH] --- yaml --- r: 300323 b: refs/heads/master c:
 9b61a4d1b2064dbd0c9e61754305ac852170509f h: refs/heads/master i:   300321:
 08c8f4cb88c3a7f8893f4efb927599b074d32870   300319:
 b81403cfbb59321617b69de1ace01d61fd062a70 v: v3

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

diff --git a/[refs] b/[refs]
index 31836d3354ee..0155c3a4f795 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 998de4acb2ba188d20768d1065658377a2e7d29b
+refs/heads/master: 9b61a4d1b2064dbd0c9e61754305ac852170509f
diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c
index f07467533365..5bb48356d217 100644
--- a/trunk/arch/arm/mm/fault.c
+++ b/trunk/arch/arm/mm/fault.c
@@ -247,7 +247,9 @@ __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
 	return handle_mm_fault(mm, vma, addr & PAGE_MASK, flags);
 
 check_stack:
-	if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
+	/* Don't allow expansion below FIRST_USER_ADDRESS */
+	if (vma->vm_flags & VM_GROWSDOWN &&
+	    addr >= FIRST_USER_ADDRESS && !expand_stack(vma, addr))
 		goto good_area;
 out:
 	return fault;