From: Hugh Dickins <hughd@google.com>
Date: Tue, 6 Mar 2012 20:28:52 +0000 (-0800)
Subject: mmap: EINVAL not ENOMEM when rejecting VM_GROWS
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c95fda1b806ed910f2a9ce2c016acd72f70075f7;p=pandora-kernel.git

mmap: EINVAL not ENOMEM when rejecting VM_GROWS

Currently error is -ENOMEM when rejecting VM_GROWSDOWN|VM_GROWSUP
from shared anonymous: hoist the file case's -EINVAL up for both.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 56a644f7eeaa..f5762ea75ea9 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1271,8 +1271,9 @@ munmap_back:
 	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) {