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

Commit e6826f07 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: switch KASan hook calling order in page alloc/free path" into msm-4.9

parents d0a3e94c 6c57699e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1742,9 +1742,9 @@ inline void post_alloc_hook(struct page *page, unsigned int order,
	set_page_refcounted(page);

	arch_alloc_page(page, order);
	kasan_alloc_pages(page, order);
	kernel_map_pages(page, 1 << order, 1);
	kernel_poison_pages(page, 1 << order, 1);
	kasan_alloc_pages(page, order);
	set_page_owner(page, order, gfp_flags);
}