Merge "mm: slub: call kasan_alloc_pages before freeing pages in slub" into msm-4.9 (70efc4bd) · Commits · e / devices / android_kernel_fairphone_FP3

mm/slub.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1673,6 +1673,7 @@ static void __free_slab(struct kmem_cache s, struct page page)
		if (current->reclaim_state)
		current->reclaim_state->reclaimed_slab += pages;
		memcg_uncharge_slab(page, order, s);
		kasan_alloc_pages(page, order);
		__free_pages(page, order);
		}

		@@ -3881,6 +3882,7 @@ void kfree(const void *x)
		if (unlikely(!PageSlab(page))) {
		BUG_ON(!PageCompound(page));
		kfree_hook(x);
		kasan_alloc_pages(page, compound_order(page));
		__free_pages(page, compound_order(page));
		return;
		}