MAINTAINERS: add maintainers for the Marvell Crypto driver

[karo-tx-linux.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 7dcf7b42068e66f59a2c4444c4a39c8851ee186e..5a71cce8c6ea8cd679dad306bd3ee655ab370a47 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -346,6 +346,7 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
 {
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma = find_vma(mm, addr);
+       unsigned long pgoff;
 
        if (!vma || vma->vm_start > addr)
                return ERR_PTR(-EFAULT);
@@ -357,17 +358,17 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
        if (old_len > vma->vm_end - addr)
                return ERR_PTR(-EFAULT);
 
+       if (new_len == old_len)
+               return vma;
+
        /* Need to be careful about a growing mapping */
-       if (new_len > old_len) {
-               unsigned long pgoff;
-
-               if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
-                       return ERR_PTR(-EFAULT);
-               pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
-               pgoff += vma->vm_pgoff;
-               if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
-                       return ERR_PTR(-EINVAL);
-       }
+       pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
+       pgoff += vma->vm_pgoff;
+       if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
+               return ERR_PTR(-EINVAL);
+
+       if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
+               return ERR_PTR(-EFAULT);
 
        if (vma->vm_flags & VM_LOCKED) {
                unsigned long locked, lock_limit;
@@ -406,13 +407,8 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
        if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
                goto out;
 
-       /* Check if the location we're moving into overlaps the
-        * old location at all, and fail if it does.
-        */
-       if ((new_addr <= addr) && (new_addr+new_len) > addr)
-               goto out;
-
-       if ((addr <= new_addr) && (addr+old_len) > new_addr)
+       /* Ensure the old/new locations do not overlap */
+       if (addr + old_len > new_addr && new_addr + new_len > addr)
                goto out;
 
        ret = do_munmap(mm, new_addr, new_len);