From: Andrea Arcangeli <aarcange@redhat.com>
Date: Tue, 10 Aug 2010 00:19:10 +0000 (-0700)
Subject: rmap: resurrect page_address_in_vma anon_vma check
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=21d0d443cdc1658a8c1484fdcece4803f0f96d0e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

rmap: resurrect page_address_in_vma anon_vma check

With root anon-vma it's trivial to keep doing the usual check as in
old-anon-vma code.

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/rmap.c b/mm/rmap.c
index f5d6799b8a74..2f855babfd06 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -364,9 +364,10 @@ vma_address(struct page *page, struct vm_area_struct *vma)
  */
 unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
 {
-	if (PageAnon(page))
-		;
-	else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
+	if (PageAnon(page)) {
+		if (vma->anon_vma->root != page_anon_vma(page)->root)
+			return -EFAULT;
+	} else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
 		if (!vma->vm_file ||
 		    vma->vm_file->f_mapping != page->mapping)
 			return -EFAULT;