---

yaml --- r: 300323 b: refs/heads/master c: 9b61a4d h: refs/heads/master i: 300321: 08c8f4c 300319: b81403c v: v3
git-mirror · May 16, 2012 · 013a233 · 013a233
1 parent a699d45
commit 013a233
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;