From a9097174f3b7158419a30fd01e9a199889e12afc Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 13 Mar 2013 14:59:43 -0700 Subject: [PATCH] --- yaml --- r: 361292 b: refs/heads/master c: 6d7825b10dbeafd60627cd04291fb10ec2b5b973 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/fremap.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 36ad0a1fc50b..3fc90872bfdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8615d3716fe327c2540cf514a34b227dc9b39e8 +refs/heads/master: 6d7825b10dbeafd60627cd04291fb10ec2b5b973 diff --git a/trunk/mm/fremap.c b/trunk/mm/fremap.c index 0cd4c11488ed..6a8da7ee85fd 100644 --- a/trunk/mm/fremap.c +++ b/trunk/mm/fremap.c @@ -163,7 +163,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, * and that the remapped range is valid and fully within * the single existing vma. */ - if (!vma || !(vma->vm_flags & VM_SHARED)) + vm_flags = vma->vm_flags; + if (!vma || !(vm_flags & VM_SHARED)) goto out; if (!vma->vm_ops || !vma->vm_ops->remap_pages) @@ -254,7 +255,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, */ out: - vm_flags = vma->vm_flags; + if (vma) + vm_flags = vma->vm_flags; if (likely(!has_write_lock)) up_read(&mm->mmap_sem); else