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

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

mm: fix ENOSPC returned by handle_mm_fault() 



Al Viro observes that in the hugetlb case, handle_mm_fault() may return
a value of the kind ENOSPC when its caller is expecting a value of the
kind VM_FAULT_SIGBUS: fix alloc_huge_page()'s failure returns.

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0d6925d4

mm/hugetlb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1033,10 +1033,10 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, 
	 */

	 */

	chg = vma_needs_reservation(h, vma, addr);

	chg = vma_needs_reservation(h, vma, addr);

	if (chg < 0)

	if (chg < 0)

		return ERR_PTR(chg);

		return ERR_PTR(-VM_FAULT_OOM);

	if (chg)

	if (chg)

		if (hugetlb_get_quota(inode->i_mapping, chg))

		if (hugetlb_get_quota(inode->i_mapping, chg))

			return ERR_PTR(-ENOSPC);

			return ERR_PTR(-VM_FAULT_SIGBUS);





	spin_lock(&hugetlb_lock);

	spin_lock(&hugetlb_lock);

	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);

	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);