Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a611444d authored by Patrick Daly's avatar Patrick Daly Committed by Gerrit - the friendly Code Review server
Browse files

mm: Inform KASAN when allocating pages during isolation



kasan_alloc_pages() should be called alongside kernel_map_pages() to
prevent splats when CONFIG_KASAN is enabled.

This is a greatly simplified version of
commit 46f24fd857b37bb86ddd5d0ac3d194e984dfdf1c
("mm/page_alloc: introduce post allocation processing on page allocator")
which solve the same problem on later kernel versions.

Change-Id: Ib60d079a4d8685e781624bb1403b2a3060e31d27
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent bf10764e
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
#include <linux/pageblock-flags.h>
#include <linux/memory.h>
#include <linux/hugetlb.h>
#include <linux/kasan.h>
#include "internal.h"

int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages)
@@ -104,6 +105,8 @@ void unset_migratetype_isolate(struct page *page, unsigned migratetype)

			if (!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;