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.

Hugh Dickins committed 15 years ago

Commit e0dcd8a1 parent 0d6925d1 file · +2 −2Browse files

Unified · Split

mm/hugetlb.c+2−2

@@ -1033,10 +1033,10 @@ static struct page alloc_huge_page(struct vm_area_struct vma, · 1032 unmodified lines
1033	*/	1033	*/
1034	chg = vma_needs_reservation(h, vma, addr);	1034	chg = vma_needs_reservation(h, vma, addr);
1035	if (chg < 0)	1035	if (chg < 0)
1036	return ERR_PTR(chg);	1036	return ERR_PTR(-VM_FAULT_OOM);
1037	if (chg)	1037	if (chg)
1038	if (hugetlb_get_quota(inode->i_mapping, chg))	1038	if (hugetlb_get_quota(inode->i_mapping, chg))
1039	return ERR_PTR(-ENOSPC);	1039	return ERR_PTR(-VM_FAULT_SIGBUS);
1040		1040
1041	spin_lock(&hugetlb_lock);	1041	spin_lock(&hugetlb_lock);
1042	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);	1042	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);