mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 03:15:31 +09:00
UPSTREAM: kasan: separate report parts by empty lines
Makes the report easier to read.
Link: http://lkml.kernel.org/r/20170302134851.101218-10-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 b193859936)
Change-Id: I8cc010a73e257cb08c7a2537d7aabd3c9c2c8116
Signed-off-by: Paul Lawrence <paullawrence@google.com>
This commit is contained in:
committed by
Paul Lawrence
parent
bef4eb3c70
commit
37070c19d5
@@ -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);
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user