kasan: simplify print_report

To simplify reading the implementation of print_report(), remove the
tagged_addr variable and rename untagged_addr to addr.

Link: https://lkml.kernel.org/r/f64f5f1093b3c06896bf0f850c5d9e661313fcb2.1662411799.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Peter Collingbourne <pcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index ac526c10ebff7e73187a56112da431a4747e5455..dc38ada86f85db578b7217b6ac67627b56de597d 100644 (file)
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -397,17 +397,16 @@ static void print_memory_metadata(const void *addr)
 
 static void print_report(struct kasan_report_info *info)
 {
-       void *tagged_addr = info->access_addr;
-       void *untagged_addr = kasan_reset_tag(tagged_addr);
-       u8 tag = get_tag(tagged_addr);
+       void *addr = kasan_reset_tag(info->access_addr);
+       u8 tag = get_tag(info->access_addr);
 
        print_error_description(info);
-       if (addr_has_metadata(untagged_addr))
+       if (addr_has_metadata(addr))
                kasan_print_tags(tag, info->first_bad_addr);
        pr_err("\n");
 
-       if (addr_has_metadata(untagged_addr)) {
-               print_address_description(untagged_addr, tag);
+       if (addr_has_metadata(addr)) {
+               print_address_description(addr, tag);
                print_memory_metadata(info->first_bad_addr);
        } else {
                dump_stack_lvl(KERN_ERR);