mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
UPSTREAM: kasan: print page description after stacks
Moves page description after the stacks since it's less important.
Link: http://lkml.kernel.org/r/20170302134851.101218-8-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 430a05f91d)
Change-Id: Ia20b7d6cf5602531072e9bd4fd478737f8623db1
Signed-off-by: Paul Lawrence <paullawrence@google.com>
This commit is contained in:
committed by
Paul Lawrence
parent
c13ce42db1
commit
ba2d145e7f
@@ -261,9 +261,6 @@ static void print_address_description(struct kasan_access_info *info)
|
||||
void *addr = (void *)info->access_addr;
|
||||
struct page *page = addr_to_page(addr);
|
||||
|
||||
if (page)
|
||||
dump_page(page, "kasan: bad access detected");
|
||||
|
||||
dump_stack();
|
||||
|
||||
if (page && PageSlab(page)) {
|
||||
@@ -273,9 +270,14 @@ static void print_address_description(struct kasan_access_info *info)
|
||||
describe_object(cache, object, addr);
|
||||
}
|
||||
|
||||
if (kernel_or_module_addr(addr)) {
|
||||
if (!init_task_stack_addr(addr))
|
||||
pr_err("Address belongs to variable %pS\n", addr);
|
||||
if (kernel_or_module_addr(addr) && !init_task_stack_addr(addr)) {
|
||||
pr_err("The buggy address belongs to the variable:\n");
|
||||
pr_err(" %pS\n", addr);
|
||||
}
|
||||
|
||||
if (page) {
|
||||
pr_err("The buggy address belongs to the page:\n");
|
||||
dump_page(page, "kasan: bad access detected");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user