Merge tag 'pipe-nonblock-2023-05-06' of git://git.kernel.dk/linux

[linux-block.git] / mm / kasan / hw_tags.c

diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index f98b9f4d9d3ef1a0dcd6898a7dc52039ab8b5607..06141bbc1e510e53a8b68c29bd4fa2da34bba74e 100644 (file)
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -285,7 +285,7 @@ static void init_vmalloc_pages(const void *start, unsigned long size)
        const void *addr;
 
        for (addr = start; addr < start + size; addr += PAGE_SIZE) {
-               struct page *page = virt_to_page(addr);
+               struct page *page = vmalloc_to_page(addr);
 
                clear_highpage_kasan_tagged(page);
        }
@@ -297,7 +297,7 @@ void *__kasan_unpoison_vmalloc(const void *start, unsigned long size,
        u8 tag;
        unsigned long redzone_start, redzone_size;
 
-       if (!kasan_vmalloc_enabled() || !is_vmalloc_or_module_addr(start)) {
+       if (!kasan_vmalloc_enabled()) {
                if (flags & KASAN_VMALLOC_INIT)
                        init_vmalloc_pages(start, size);
                return (void *)start;