From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967478AbdCXThI (ORCPT ); Fri, 24 Mar 2017 15:37:08 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:37733 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967019AbdCXTco (ORCPT ); Fri, 24 Mar 2017 15:32:44 -0400 From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrey Konovalov Subject: [PATCH v4 7/9] kasan: print page description after stacks Date: Fri, 24 Mar 2017 20:32:33 +0100 Message-Id: <06d2e8e2e4ae9f2794fa8026c292fb90eb9e362c.1490383597.git.andreyknvl@google.com> X-Mailer: git-send-email 2.12.1.578.ge9c3154ca4-goog In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Moves page description after the stacks since it's less important. Signed-off-by: Andrey Konovalov --- 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 06e27a342d1d..e0f7dbf9e883 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -242,9 +242,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)) { @@ -254,9 +251,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.1.578.ge9c3154ca4-goog