Commit e0dcd8a0 authored Jun 05, 2011 by Hugh Dickins Committed by Linus Torvalds Jun 06, 2011

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: Hugh Dickins <hughd@google.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0d6925d4

mm/hugetlb.c

+2 −2

Original line number	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);
		if (chg < 0)
		return ERR_PTR(chg);
		return ERR_PTR(-VM_FAULT_OOM);
		if (chg)
		if (hugetlb_get_quota(inode->i_mapping, chg))
		return ERR_PTR(-ENOSPC);
		return ERR_PTR(-VM_FAULT_SIGBUS);

		spin_lock(&hugetlb_lock);
		page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);

Admin message