Moves page description after the stacks since it's less important.

Signed-off-by: Andrey Konovalov <andreyk...@google.com>
---
 mm/kasan/report.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 8dfb7a060d69..1d2b15174a98 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -259,9 +259,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)) {
@@ -271,9 +268,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");
        }
 }
 
-- 
2.12.0.rc1.440.g5b76565f74-goog

Reply via email to