Merge tag 'for-6.4/io_uring-2023-05-07' of git://git.kernel.dk/linux

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

diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index cb762982c8baf7d6b0eaee13a11d83b7ff87cebe..e5eef670735ef195380ea068230979892cfa666f 100644 (file)
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -172,10 +172,8 @@ static __always_inline bool check_region_inline(unsigned long addr,
        if (unlikely(addr + size < addr))
                return !kasan_report(addr, size, write, ret_ip);
 
-       if (unlikely((void *)addr <
-               kasan_shadow_to_mem((void *)KASAN_SHADOW_START))) {
+       if (unlikely(!addr_has_metadata((void *)addr)))
                return !kasan_report(addr, size, write, ret_ip);
-       }
 
        if (likely(!memory_is_poisoned(addr, size)))
                return true;