diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-13 20:14:37 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-13 20:14:37 +0200 |
| commit | 473b2922c7e54260268c9bb037d2ff9f327422ab (patch) | |
| tree | 40cee01f50cb0f285399c406ceba7b5acb58e486 /mm/page_poison.c | |
| parent | perf vendor events amd: Add Zen3 events (diff) | |
| parent | Merge tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-473b2922c7e54260268c9bb037d2ff9f327422ab.tar.xz linux-473b2922c7e54260268c9bb037d2ff9f327422ab.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that got into upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'mm/page_poison.c')
| -rw-r--r-- | mm/page_poison.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/page_poison.c b/mm/page_poison.c index 65cdf844c8ad..655dc5895604 100644 --- a/mm/page_poison.c +++ b/mm/page_poison.c @@ -77,12 +77,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); } |