Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd57613 authored by Derek's avatar Derek Committed by Linus Torvalds
Browse files

mm/mremap.c: clean up goto just return ERR_PTR 



As suggested by Kirill the "goto"s in vma_to_resize aren't necessary, just
change them to explicit return.

Signed-off-by: default avatarDerek Che <crquan@ymail.com>
Suggested-by: default avatar"Kirill A. Shutemov" <kirill@shutemov.name>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12215182

mm/mremap.c

+8 −17
Original line number Diff line number Diff line
@@ -345,25 +345,25 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, 
	struct vm_area_struct *vma = find_vma(mm, addr);



	if (!vma || vma->vm_start > addr)

		goto Efault;

		return ERR_PTR(-EFAULT);



	if (is_vm_hugetlb_page(vma))

		goto Einval;

		return ERR_PTR(-EINVAL);



	/* We can't remap across vm area boundaries */

	if (old_len > vma->vm_end - addr)

		goto Efault;

		return ERR_PTR(-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))

			goto Efault;

			return ERR_PTR(-EFAULT);

		pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;

		pgoff += vma->vm_pgoff;

		if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)

			goto Einval;

			return ERR_PTR(-EINVAL);

	}



	if (vma->vm_flags & VM_LOCKED) {
@@ -372,29 +372,20 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, 
		lock_limit = rlimit(RLIMIT_MEMLOCK);

		locked += new_len - old_len;

		if (locked > lock_limit && !capable(CAP_IPC_LOCK))

			goto Eagain;

			return ERR_PTR(-EAGAIN);

	}



	if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT))

		goto Enomem;

		return ERR_PTR(-ENOMEM);



	if (vma->vm_flags & VM_ACCOUNT) {

		unsigned long charged = (new_len - old_len) >> PAGE_SHIFT;

		if (security_vm_enough_memory_mm(mm, charged))

			goto Enomem;

			return ERR_PTR(-ENOMEM);

		*p = charged;

	}



	return vma;



Efault:	/* very odd choice for most of the cases, but... */

	return ERR_PTR(-EFAULT);

Einval:

	return ERR_PTR(-EINVAL);

Enomem:

	return ERR_PTR(-ENOMEM);

Eagain:

	return ERR_PTR(-EAGAIN);

}



static unsigned long mremap_to(unsigned long addr, unsigned long old_len,