Commit 0bf598d8 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds

mbind: add BUG_ON(!vma) in new_vma_page()

new_vma_page() is called only by page migration called from do_mbind(),
where pages to be migrated are queued into a pagelist by
queue_pages_range().  queue_pages_range() confirms that a queued page
belongs to some vma, so !vma case is not supposed to be happen.  This
patch adds BUG_ON() to catch this unexpected case.
Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98094945
...@@ -1196,12 +1196,14 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int * ...@@ -1196,12 +1196,14 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
break; break;
vma = vma->vm_next; vma = vma->vm_next;
} }
/*
* queue_pages_range() confirms that @page belongs to some vma,
* so vma shouldn't be NULL.
*/
BUG_ON(!vma);
if (PageHuge(page)) if (PageHuge(page))
return alloc_huge_page_noerr(vma, address, 1); return alloc_huge_page_noerr(vma, address, 1);
/*
* if !vma, alloc_page_vma() will use task or system default policy
*/
return alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address); return alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment