Update to 2.6.32.39 Mainline
/mm/mremap.c
blob:3e98d79f55892e66abd5cea68adbf4191e2eaada -> blob:166b824c20667e743c7b7b2e6474cb6fb7642eca
--- mm/mremap.c
+++ mm/mremap.c
@@ -275,16 +275,9 @@ static struct vm_area_struct *vma_to_res
if (old_len > vma->vm_end - addr)
goto Efault;
- /* Need to be careful about a growing mapping */
- if (new_len > old_len) {
- unsigned long pgoff;
-
- if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
+ if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) {
+ if (new_len > old_len)
goto Efault;
- pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
- pgoff += vma->vm_pgoff;
- if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
- goto Einval;
}
if (vma->vm_flags & VM_LOCKED) {