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

Commit cd2579d7 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] hugetlb: fix error return for brk() entering a hugepage region 



Commit cb07c9a1 causes the wrong return
value.  is_hugepage_only_range() is a boolean, so we should return
-EINVAL rather than 1.

Also - we can use "mm" instead of looking up "current->mm" again.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f794b60

mm/mmap.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1880,9 +1880,8 @@ unsigned long do_brk(unsigned long addr, unsigned long len) 
	if ((addr + len) > TASK_SIZE || (addr + len) < addr)

	if ((addr + len) > TASK_SIZE || (addr + len) < addr)

		return -EINVAL;

		return -EINVAL;





	error = is_hugepage_only_range(current->mm, addr, len);

	if (is_hugepage_only_range(mm, addr, len))

	if (error)

		return -EINVAL;

		return error;





	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;

	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;