diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-01 23:47:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 23:47:38 -0800 |
| commit | daa2c4f942fded4fed9c36734e9ebd97421b67a3 (patch) | |
| tree | 1194d320996f87b9a248c0b89dae614fec666831 | |
| parent | e349b1b10cbe53ac05dc3c2e354ba831476ad773 (diff) | |
| parent | 6adac935e61895ec353ba28b9911ff954a4dcd15 (diff) | |
Merge "mm: Inform KASAN when allocating pages during isolation"
| -rw-r--r-- | mm/page_isolation.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 00c96462cc36..3ecd3807c2c2 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -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; |