Messages in this thread Patch in this message | | | Date | Sun, 5 Jun 2011 22:03:13 -0700 (PDT) | From | Hugh Dickins <> | Subject | [PATCH] 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 ---
mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- 3.0-rc1/mm/hugetlb.c 2011-05-29 18:42:37.425882575 -0700 +++ linux/mm/hugetlb.c 2011-06-05 13:33:22.795341004 -0700 @@ -1033,10 +1033,10 @@ static struct page *alloc_huge_page(stru */ 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);
| |