Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6b72f49 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan: change allocation and freeing stack traces headers 

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: default avatarAndrey Konovalov <andreyknvl@google.com>
Acked-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d418f7b

mm/kasan/report.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -177,9 +177,9 @@ static void kasan_end_report(unsigned long *flags) 
	kasan_enable_current();

	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) {

	if (track->stack) {

		struct stack_trace trace;

		struct stack_trace trace;
@@ -201,10 +201,8 @@ static void kasan_object_err(struct kmem_cache *cache, void *object) 
	if (!(cache->flags & SLAB_KASAN))

	if (!(cache->flags & SLAB_KASAN))

		return;

		return;





	pr_err("Allocated:\n");

	print_track(&alloc_info->alloc_track, "Allocated");

	print_track(&alloc_info->alloc_track);

	print_track(&alloc_info->free_track, "Freed");

	pr_err("Freed:\n");

	print_track(&alloc_info->free_track);

}

}





void kasan_report_double_free(struct kmem_cache *cache, void *object,

void kasan_report_double_free(struct kmem_cache *cache, void *object,