From 31d246bf878264d454194b0fbed887d39f3a2204 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 12 Nov 2008 01:24:41 +0100
Subject: [PATCH] --- yaml --- r: 118835 b: refs/heads/master c:
 1c1271850494f06b63ae6b485e2e1b9c27ffb2d1 h: refs/heads/master i:   118833:
 e716c0fcd77eb39caa34ca606e4f70b144fc343d   118831:
 0bcdcb84de05dd43d87673ed71e9a6187e482ec8 v: v3

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

diff --git a/[refs] b/[refs]
index 2cf6f5dbd447..bcf2adcc48dd 100644
--- 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
index de14ac21e5b5..d4855a682ab6 100644
--- 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)