| Message ID | 20210122155642.23187-4-vincenzo.frascino@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kasan: Fix metadata detection for KASAN_HW_TAGS | expand |
On Fri, Jan 22, 2021 at 4:57 PM Vincenzo Frascino <vincenzo.frascino@arm.com> wrote: > > Currently, addr_has_metadata() returns true for every address. > An invalid address (e.g. NULL) passed to the function when, > KASAN_HW_TAGS is enabled, leads to a kernel panic. > > Make addr_has_metadata() return true for valid addresses only. > > Note: KASAN_HW_TAGS support for vmalloc will be added with a future > patch. > > Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> > Cc: Alexander Potapenko <glider@google.com> > Cc: Dmitry Vyukov <dvyukov@google.com> > Cc: Leon Romanovsky <leonro@mellanox.com> > Cc: Andrey Konovalov <andreyknvl@google.com> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> > --- > mm/kasan/kasan.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index cc4d9e1d49b1..8c706e7652f2 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -209,7 +209,7 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, > > static inline bool addr_has_metadata(const void *addr) > { > - return true; > + return (is_vmalloc_addr(addr) || virt_addr_valid(addr)); > } > > #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > -- > 2.30.0 > Reviewed-by: Andrey Konovalov <andreyknvl@google.com> Thanks!
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index cc4d9e1d49b1..8c706e7652f2 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -209,7 +209,7 @@ bool check_memory_region(unsigned long addr, size_t size, bool write, static inline bool addr_has_metadata(const void *addr) { - return true; + return (is_vmalloc_addr(addr) || virt_addr_valid(addr)); } #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
Currently, addr_has_metadata() returns true for every address. An invalid address (e.g. NULL) passed to the function when, KASAN_HW_TAGS is enabled, leads to a kernel panic. Make addr_has_metadata() return true for valid addresses only. Note: KASAN_HW_TAGS support for vmalloc will be added with a future patch. Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Leon Romanovsky <leonro@mellanox.com> Cc: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- mm/kasan/kasan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)