Skip to content

Commit

Permalink
kasan: separate report parts by empty lines
Browse files Browse the repository at this point in the history
Makes the report easier to read.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Andrey Konovalov <[email protected]>
Acked-by: Dmitry Vyukov <[email protected]>
Cc: Andrey Ryabinin <[email protected]>
Cc: Alexander Potapenko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
xairy authored and torvalds committed May 3, 2017
1 parent 5ab6d91 commit b193859
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions mm/kasan/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,9 @@ static void describe_object(struct kmem_cache *cache, void *object,

if (cache->flags & SLAB_KASAN) {
print_track(&alloc_info->alloc_track, "Allocated");
pr_err("\n");
print_track(&alloc_info->free_track, "Freed");
pr_err("\n");
}

describe_object_addr(cache, object, addr);
Expand All @@ -248,6 +250,7 @@ static void print_address_description(void *addr)
struct page *page = addr_to_page(addr);

dump_stack();
pr_err("\n");

if (page && PageSlab(page)) {
struct kmem_cache *cache = page->slab_cache;
Expand Down Expand Up @@ -326,7 +329,9 @@ void kasan_report_double_free(struct kmem_cache *cache, void *object,

kasan_start_report(&flags);
pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", ip);
pr_err("\n");
print_address_description(object);
pr_err("\n");
print_shadow_for_address(object);
kasan_end_report(&flags);
}
Expand All @@ -338,11 +343,13 @@ static void kasan_report_error(struct kasan_access_info *info)
kasan_start_report(&flags);

print_error_description(info);
pr_err("\n");

if (!addr_has_shadow(info)) {
dump_stack();
} else {
print_address_description((void *)info->access_addr);
pr_err("\n");
print_shadow_for_address(info->first_bad_addr);
}

Expand Down

0 comments on commit b193859

Please sign in to comment.