diff --git a/mm/page_poison.c b/mm/page_poison.c
index ae0482cded87c3eb9699e1a291eff7ad746ef50d..a08423cb11ca9b6beb4375ba44232895abab464d 100644
--- a/mm/page_poison.c
+++ b/mm/page_poison.c
@@ -108,12 +108,14 @@ static void unpoison_page(struct page *page)
 	void *addr;
 
 	addr = kmap_atomic(page);
+	kasan_disable_current();
 	/*
 	 * Page poisoning when enabled poisons each and every page
 	 * that is freed to buddy. Thus no extra check is done to
 	 * see if a page was poisoned.
 	 */
-	check_poison_mem(addr, PAGE_SIZE);
+	check_poison_mem(kasan_reset_tag(addr), PAGE_SIZE);
+	kasan_enable_current();
 	kunmap_atomic(addr);
 }