From patchwork Tue Mar 28 14:00:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 744300 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vssyJ6jrfz9s7M for ; Wed, 29 Mar 2017 01:01:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="JbUR6/9P"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755593AbdC1OBo (ORCPT ); Tue, 28 Mar 2017 10:01:44 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:33034 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbdC1OBc (ORCPT ); Tue, 28 Mar 2017 10:01:32 -0400 Received: by mail-wr0-f172.google.com with SMTP id w43so92176309wrb.0 for ; Tue, 28 Mar 2017 07:01:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Rw+5ATYVkVrDnRCGztm3m5ZSv7fbBfnX5nt6yXQFO74=; b=JbUR6/9P0lbS9uC4H2GjQ3L9H3JH9kEVEUGS7AQAcqVyo9ETLlsgE9A/1NuB9XRcT4 +dU11py6cvnjOx/vhobSlL+tDVjaYxae2hNkTt2Z7uByof6e/Udk3tJDLIt7oUQqMl1J d/BEJgI8UNSr97VdTiQNr+4T5+jDqb6gVpHhbM0ZbCqrXLeg5Qe6n5C1ItqI9wV9MdQ/ SejYY7hQvEqq2Vg0wWb3lZoC3ti5JP8SNTcLVMGNskKOrvJp1jIe/H1qLA11gGxfBcwA xWZ6XO4rYK+e+NIpKSR/3i2toceBjbWDaM7WV+YtccTMHd+LTsjgESsD9X8p0dTPxJI2 olMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Rw+5ATYVkVrDnRCGztm3m5ZSv7fbBfnX5nt6yXQFO74=; b=b6bdrSHaHpuz3DXmm4PsXIn+emWKrFYzSt8FJDtHhzetpn61sbUNFtupXV68yKNbo8 GYCuFkAreZkriwi0IXyqSp1QWIpHswImjRVgxrRbt4YWpy43aoLX5FKPjpLBXjOEYqqC bFLU9S6N7OFiaOLL3XQlwbchaK/BhsW0jPoj1tDP1QqSpZkQt8PRweGuqrBNf2wOfuPL 53baqmqYPKGHlple+rYoS7v3wf/x9DfY9QoGN0Zb9MeErNc7UENQbAVtM7lCmzILRv+s H/7rCfbHsdA8OPaEkqYpTSL6oHfKUBb7c8s2a9GS5tohZmuDIAgMM2K/LiN+A8eMHzln MFYQ== X-Gm-Message-State: AFeK/H0P9w48Qg2lrC6GPpYCmHsGiuu9bbKydVzTyaP3knTNlkVLTB9/FFfIm6a3agpgyV+j X-Received: by 10.223.176.175 with SMTP id i44mr26465652wra.96.1490709665728; Tue, 28 Mar 2017 07:01:05 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([100.105.12.17]) by smtp.gmail.com with ESMTPSA id k105sm4990189wrc.12.2017.03.28.07.01.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 07:01:04 -0700 (PDT) Received: by andreyknvl0.muc.corp.google.com (Postfix, from userid 206546) id 4A9D2180AF3; Tue, 28 Mar 2017 16:00:56 +0200 (CEST) From: Andrey Konovalov To: "David S . Miller" , Eric Dumazet , Willem de Bruijn , Craig Gallek Cc: netdev@vger.kernel.org, Dmitry Vyukov , Kostya Serebryany , Andrey Konovalov Subject: [PATCH v4 7/9] kasan: print page description after stacks Date: Tue, 28 Mar 2017 16:00:52 +0200 Message-Id: <06d2e8e2e4ae9f2794fa8026c292fb90eb9e362c.1490383597.git.andreyknvl@google.com> X-Mailer: git-send-email 2.12.2.564.g063fe858b8-goog In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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"); } }