UPSTREAM: kasan: change report header

Change report header format from:

  BUG: KASAN: use-after-free in unwind_get_return_address+0x28a/0x2c0 at addr ffff880069437950
  Read of size 8 by task insmod/3925

to:

  BUG: KASAN: use-after-free in unwind_get_return_address+0x28a/0x2c0
  Read of size 8 at addr ffff880069437950 by task insmod/3925

The exact access address is not usually important, so move it to the
second line.  This also makes the header look visually balanced.

Link: http://lkml.kernel.org/r/20170302134851.101218-6-andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 64145065
(cherry-picked from 7f0a84c23b1dede3e76a7b2ebbde45a506252005)
Change-Id: If9cacce637c317538d813b05ef2647707300d310
Signed-off-by: Paul Lawrence <paullawrence@google.com>

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index a82d6896062bebe3daee60310aed705b03bfbaf9..8efc69473a37ad67675316e61888de73e006ab08 100644 (file)
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -132,11 +132,11 @@ static void print_error_description(struct kasan_access_info *info)
 {
        const char *bug_type = get_bug_type(info);
 
-       pr_err("BUG: KASAN: %s in %pS at addr %p\n",
-               bug_type, (void *)info->ip, info->access_addr);
-       pr_err("%s of size %zu by task %s/%d\n",
+       pr_err("BUG: KASAN: %s in %pS\n",
+               bug_type, (void *)info->ip);
+       pr_err("%s of size %zu at addr %p by task %s/%d\n",
                info->is_write ? "Write" : "Read", info->access_size,
-               current->comm, task_pid_nr(current));
+               info->access_addr, current->comm, task_pid_nr(current));
 }
 
 static inline bool kernel_or_module_addr(const void *addr)