---
Change-Id: I03706fe34b38da7860c39aa0968e00001a7d1873
---
 mm/kasan/kasan.h          | 2 +-
 mm/kasan/report.c         | 6 +++---
 mm/kasan/report_generic.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index d0cf61d4d70d..f9366dfd94c9 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h

@@ -146,7 +146,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 af9138ea54ad..2990ca34abaf 100644
--- 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 b543a1ed6078..16ed550850e9 100644
--- 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);
 }
--

2.29.2.222.g5d2a92d10f8-goog