kasan: rename addr_has_shadow to addr_has_metadata

This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.

Hardware tag-based KASAN won't be using shadow memory, but will reuse this
function.  Rename "shadow" to implementation-neutral "metadata".

No functional changes.

Link: https://lkml.kernel.org/r/370466fba590a4596b55ffd38adfd990f8886db4.1606161801.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Marco Elver <elver@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 488ca1ff59791e5d6698efb7001b1a3044d60ef1..c79d30c6fcdbfe45f8a1255c6a392f5fa935ef7b 100644 (file)
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -147,7 +147,7 @@ static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
                << KASAN_SHADOW_SCALE_SHIFT);
 }
 
-static inline bool addr_has_shadow(const void *addr)
+static inline bool addr_has_metadata(const void *addr)
 {
        return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
 }

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 914ab5cfc3ea26b9c404571b5b90df2c3561f0b4..a265c16c0f3f71e1644d935cc0384754019940fe 100644 (file)
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -361,7 +361,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
        untagged_addr = reset_tag(tagged_addr);
 
        info.access_addr = tagged_addr;
-       if (addr_has_shadow(untagged_addr))
+       if (addr_has_metadata(untagged_addr))
                info.first_bad_addr = find_first_bad_addr(tagged_addr, size);
        else
                info.first_bad_addr = untagged_addr;
@@ -372,11 +372,11 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
        start_report(&flags);
 
        print_error_description(&info);
-       if (addr_has_shadow(untagged_addr))
+       if (addr_has_metadata(untagged_addr))
                print_tags(get_tag(tagged_addr), info.first_bad_addr);
        pr_err("\n");
 
-       if (addr_has_shadow(untagged_addr)) {
+       if (addr_has_metadata(untagged_addr)) {
                print_address_description(untagged_addr, get_tag(tagged_addr));
                pr_err("\n");
                print_shadow_for_address(info.first_bad_addr);

diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c
index b543a1ed6078fa1c18791dfc437a95020e27aac8..16ed550850e9bbeb0bb534a53c0308ccf59a7992 100644 (file)
--- a/mm/kasan/report_generic.c
+++ b/mm/kasan/report_generic.c
@@ -118,7 +118,7 @@ const char *get_bug_type(struct kasan_access_info *info)
        if (info->access_addr + info->access_size < info->access_addr)
                return "out-of-bounds";
 
-       if (addr_has_shadow(info->access_addr))
+       if (addr_has_metadata(info->access_addr))
                return get_shadow_bug_type(info);
        return get_wild_bug_type(info);
 }