summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2010-08-02 20:40:44 +0200
committerAndrea Arcangeli <aarcange@redhat.com>2010-08-02 18:43:03 +0000
commita79fef2988391b4436f43cd6d5c3a176094fb541 (patch)
treec15dbdd687b77286df58505b65a7506f9d49b9d0
parent5e284e4e651b9b70bf704b431422f740c7e26d0d (diff)
resurrect the check in page_address_in_vma
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>
-rw-r--r--mm/rmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index f56e9b5f7c31..ab6c7d0d9b46 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -363,9 +363,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;