OSDN Git Service

UPSTREAM: kasan: change allocation and freeing stack traces headers
authorAndrey Konovalov <andreyknvl@google.com>
Wed, 3 May 2017 21:56:31 +0000 (14:56 -0700)
committerPaul Lawrence <paullawrence@google.com>
Thu, 14 Dec 2017 16:25:31 +0000 (08:25 -0800)
Change stack traces headers from:

  Allocated:
  PID = 42

to:

  Allocated by task 42:

Makes the report one line shorter and look better.

Link: http://lkml.kernel.org/r/20170302134851.101218-4-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 b6b72f4919c121bee5890732e0b8de2ab99c8dbc)
Change-Id: Iab66777f16016b5a3a8ce85f7cc62d4572fcf5b0
Signed-off-by: Paul Lawrence <paullawrence@google.com>
mm/kasan/report.c

index d6b6ec7..7d24363 100644 (file)
@@ -177,9 +177,9 @@ static void kasan_end_report(unsigned long *flags)
        kasan_enable_current();
 }
 
-static void print_track(struct kasan_track *track)
+static void print_track(struct kasan_track *track, const char *prefix)
 {
-       pr_err("PID = %u\n", track->pid);
+       pr_err("%s by task %u:\n", prefix, track->pid);
        if (track->stack) {
                struct stack_trace trace;
 
@@ -201,10 +201,8 @@ static void kasan_object_err(struct kmem_cache *cache, void *object)
        if (!(cache->flags & SLAB_KASAN))
                return;
 
-       pr_err("Allocated:\n");
-       print_track(&alloc_info->alloc_track);
-       pr_err("Freed:\n");
-       print_track(&alloc_info->free_track);
+       print_track(&alloc_info->alloc_track, "Allocated");
+       print_track(&alloc_info->free_track, "Freed");
 }
 
 void kasan_report_double_free(struct kmem_cache *cache, void *object,