Skip to content

Commit 61ebe5a

Browse files
hailong-liuakpm00
authored andcommitted
mm/vmalloc: fix page mapping if vm_area_alloc_pages() with high order fallback to order 0
The __vmap_pages_range_noflush() assumes its argument pages** contains pages with the same page shift. However, since commit e9c3cda ("mm, vmalloc: fix high order __GFP_NOFAIL allocations"), if gfp_flags includes __GFP_NOFAIL with high order in vm_area_alloc_pages() and page allocation failed for high order, the pages** may contain two different page shifts (high order and order-0). This could lead __vmap_pages_range_noflush() to perform incorrect mappings, potentially resulting in memory corruption. Users might encounter this as follows (vmap_allow_huge = true, 2M is for PMD_SIZE): kvmalloc(2M, __GFP_NOFAIL|GFP_X) __vmalloc_node_range_noprof(vm_flags=VM_ALLOW_HUGE_VMAP) vm_area_alloc_pages(order=9) ---> order-9 allocation failed and fallback to order-0 vmap_pages_range() vmap_pages_range_noflush() __vmap_pages_range_noflush(page_shift = 21) ----> wrong mapping happens We can remove the fallback code because if a high-order allocation fails, __vmalloc_node_range_noprof() will retry with order-0. Therefore, it is unnecessary to fallback to order-0 here. Therefore, fix this by removing the fallback code. Link: https://lkml.kernel.org/r/[email protected] Fixes: e9c3cda ("mm, vmalloc: fix high order __GFP_NOFAIL allocations") Signed-off-by: Hailong Liu <[email protected]> Reported-by: Tangquan Zheng <[email protected]> Reviewed-by: Baoquan He <[email protected]> Reviewed-by: Uladzislau Rezki (Sony) <[email protected]> Acked-by: Barry Song <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent d75abd0 commit 61ebe5a

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

mm/vmalloc.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3584,15 +3584,8 @@ vm_area_alloc_pages(gfp_t gfp, int nid,
35843584
page = alloc_pages_noprof(alloc_gfp, order);
35853585
else
35863586
page = alloc_pages_node_noprof(nid, alloc_gfp, order);
3587-
if (unlikely(!page)) {
3588-
if (!nofail)
3589-
break;
3590-
3591-
/* fall back to the zero order allocations */
3592-
alloc_gfp |= __GFP_NOFAIL;
3593-
order = 0;
3594-
continue;
3595-
}
3587+
if (unlikely(!page))
3588+
break;
35963589

35973590
/*
35983591
* Higher order allocations must be able to be treated as

0 commit comments

Comments
 (0)