From patchwork Tue Mar 28 14:00:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 744303 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 3vssyr02xwz9s7M for ; Wed, 29 Mar 2017 01:02:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="wBafD0EN"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755644AbdC1OCA (ORCPT ); Tue, 28 Mar 2017 10:02:00 -0400 Received: from mail-lf0-f48.google.com ([209.85.215.48]:34435 "EHLO mail-lf0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752667AbdC1OBc (ORCPT ); Tue, 28 Mar 2017 10:01:32 -0400 Received: by mail-lf0-f48.google.com with SMTP id z15so38921746lfd.1 for ; Tue, 28 Mar 2017 07:01:25 -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=geq9XP8+0xk46OLjZOTWDBDIJWZwG85FOPUJrw4MMik=; b=wBafD0ENbnhK7O1lhXEflVQG3vfVojaFMEOd44XWYiNepNobMBMYgmGmqqUveHHUri 5yKhNIVMIikYJ1hnqwl2/mZ8syQXvgHBnlMlegCMRCuhF6lXhRR+UanXfbc3SLhY4W/A khr/M4fhjKd0KH1UYShbBa/tpyQSPMw6gPo19A71f1wd8qeJux8zvd1+TioYIiLC5C3z t8tVAHKMesskhlkbWCjor2Ft7GyzEXSv36o2ldl8NQ1Nf+KiU+nedaHA7riP7pyYC6sY 5f+l/+ctlSKKB+hIYpiM0OoCeRyLUixz9TfeN9xR8NDbtlWbmMHbGYDYm4bmIRCqoxm2 9i6A== 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=geq9XP8+0xk46OLjZOTWDBDIJWZwG85FOPUJrw4MMik=; b=N3GBMUX8x/xf7kFxFOS18APHJbmU32IrzYobzv5HOB5+MplazYnn4apMKpQlSJilme TMnGMDMxoQ8XKEXAF9a/DG8sBK85igCKG4+D2hPgKkUdq71v3tEJYfOlEsf28hvBDSpm yogYfiIfrEEpxBf5zNeLRQwvVrjP+3kPSrYHGKfNPj4FefkmbWH2xJaGgaOfJEqebgNO Ym5+sPUMbouTn7elgQo6fW25o4JOe06lKvBJOwRDsU4a+euxhR1+6GzPvvZxaRXQBhJb V841ubXENHnUDDXFfHQMmWeu2ge1v025bwu2qln6Gw1wmdkEVDg8IZ6JxohkXlvbHmYI d2mg== X-Gm-Message-State: AFeK/H0nDhIBWdv65F/5er7cqtwwrfozZaiMjikqwKFWprfAtQHQtqAgFSCeHkfXNYNGeQr3 X-Received: by 10.28.222.4 with SMTP id v4mr14638525wmg.75.1490709665006; 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 t79sm3755077wmd.29.2017.03.28.07.01.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 07:01:02 -0700 (PDT) Received: by andreyknvl0.muc.corp.google.com (Postfix, from userid 206546) id 48A0C182EE7; Tue, 28 Mar 2017 16:00:55 +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 2/9] kasan: unify report headers Date: Tue, 28 Mar 2017 16:00:43 +0200 Message-Id: <1e8bb4d01cf38337d7bbbd0d09bc6da01c60da42.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 Unify KASAN report header format for different kinds of bad memory accesses. Makes the code simpler. Signed-off-by: Andrey Konovalov --- mm/kasan/report.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index e3af37b7a74c..fc0577d15671 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -119,16 +119,22 @@ static const char *get_wild_bug_type(struct kasan_access_info *info) return bug_type; } +static const char *get_bug_type(struct kasan_access_info *info) +{ + if (addr_has_shadow(info)) + return get_shadow_bug_type(info); + return get_wild_bug_type(info); +} + static void print_error_description(struct kasan_access_info *info) { - const char *bug_type = get_shadow_bug_type(info); + const char *bug_type = get_bug_type(info); pr_err("BUG: KASAN: %s in %pS at addr %p\n", - bug_type, (void *)info->ip, - info->access_addr); + bug_type, (void *)info->ip, info->access_addr); pr_err("%s of size %zu by task %s/%d\n", - info->is_write ? "Write" : "Read", - info->access_size, current->comm, task_pid_nr(current)); + info->is_write ? "Write" : "Read", info->access_size, + current->comm, task_pid_nr(current)); } static inline bool kernel_or_module_addr(const void *addr) @@ -295,17 +301,11 @@ static void kasan_report_error(struct kasan_access_info *info) kasan_start_report(&flags); + print_error_description(info); + if (!addr_has_shadow(info)) { - const char *bug_type = get_wild_bug_type(info); - pr_err("BUG: KASAN: %s on address %p\n", - bug_type, info->access_addr); - pr_err("%s of size %zu by task %s/%d\n", - info->is_write ? "Write" : "Read", - info->access_size, current->comm, - task_pid_nr(current)); dump_stack(); } else { - print_error_description(info); print_address_description(info); print_shadow_for_address(info->first_bad_addr); }