---

yaml --- r: 118835 b: refs/heads/master c: 1c12718 h: refs/heads/master i: 118833: e716c0f 118831: 0bcdcb8 v: v3
git-mirror · Nov 12, 2008 · 31d246b · 31d246b
1 parent 7e6bd84
commit 31d246b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08c1184fa2b785f23453b8cbb43f86b409cde3a6
+refs/heads/master: 1c1271850494f06b63ae6b485e2e1b9c27ffb2d1
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1704,7 +1704,7 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr)
 	vma = find_vma_prev(mm, addr, &prev);
 	if (vma && (vma->vm_start <= addr))
 		return vma;
-	if (expand_stack(prev, addr))
+	if (!prev || expand_stack(prev, addr))
 		return NULL;
 	if (prev->vm_flags & VM_LOCKED) {
 		if (mlock_vma_pages_range(prev, addr, prev->vm_end) < 0)