Merge "mm: Inform KASAN when allocating pages during isolation"
This commit is contained in:
commit
daa2c4f942
1 changed files with 3 additions and 0 deletions
|
@ -7,6 +7,7 @@
|
|||
#include <linux/pageblock-flags.h>
|
||||
#include <linux/memory.h>
|
||||
#include <linux/hugetlb.h>
|
||||
#include <linux/kasan.h>
|
||||
#include "internal.h"
|
||||
|
||||
static int set_migratetype_isolate(struct page *page,
|
||||
|
@ -105,6 +106,8 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
|
|||
if (pfn_valid_within(page_to_pfn(buddy)) &&
|
||||
!is_migrate_isolate_page(buddy)) {
|
||||
__isolate_free_page(page, order);
|
||||
kasan_alloc_pages(page, order);
|
||||
arch_alloc_page(page, order);
|
||||
kernel_map_pages(page, (1 << order), 1);
|
||||
set_page_refcounted(page);
|
||||
isolated_page = page;
|
||||
|
|
Loading…
Add table
Reference in a new issue