---

yaml --- r: 74642 b: refs/heads/master c: 8869477 h: refs/heads/master v: v3
git-mirror · Dec 5, 2007 · 462aa34 · 462aa34
1 parent 80b50c4
commit 462aa34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab5a91a8364c3d6fc617abc47cc81d162c01d90a
+refs/heads/master: 8869477a49c3e99def1fcdadd6bbc407fea14b45
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1615,15 +1615,19 @@ static inline int expand_downwards(struct vm_area_struct *vma,
 	 */
 	if (unlikely(anon_vma_prepare(vma)))
 		return -ENOMEM;
+
+	address &= PAGE_MASK;
+	error = security_file_mmap(0, 0, 0, 0, address, 1);
+	if (error)
+		return error;
+
 	anon_vma_lock(vma);
 
 	/*
 	 * vma->vm_start/vm_end cannot change under us because the caller
 	 * is required to hold the mmap_sem in read mode.  We need the
 	 * anon_vma lock to serialize against concurrent expand_stacks.
 	 */
-	address &= PAGE_MASK;
-	error = 0;
 
 	/* Somebody else might have raced and expanded it already */
 	if (address < vma->vm_start) {