From ddc08898e7501aab4a93c62f64cf253b469bfb0f Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Tue, 6 Mar 2012 12:28:52 -0800
Subject: [PATCH] --- yaml --- r: 288285 b: refs/heads/master c:
 ce8fea7aa4ad9e3b40999a08622ef27c77159659 h: refs/heads/master i:   288283:
 e39cef90712c46a6b3fcb7ba3905e27e623e2546 v: v3

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

diff --git a/[refs] b/[refs]
index e37050866292..5ccd4e5dba8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 917ec63b61720b177271450399bca2f8c5168c0d
+refs/heads/master: ce8fea7aa4ad9e3b40999a08622ef27c77159659
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 22e1a0b2f70c..09ce2cae07ca 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1266,8 +1266,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	vma->vm_pgoff = pgoff;
 	INIT_LIST_HEAD(&vma->anon_vma_chain);
 
+	error = -EINVAL;	/* when rejecting VM_GROWSDOWN|VM_GROWSUP */
+
 	if (file) {
-		error = -EINVAL;
 		if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
 			goto free_vma;
 		if (vm_flags & VM_DENYWRITE) {