Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1593493
| Path | csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Andrey Konovalov <andreyknvl@google.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 2/9] kasan: unify report headers |
| Date | Mon, 06 Mar 2017 17:10:01 +0100 |
| Message-ID | <ti3mV-2d9-5@gated-at.bofh.it> (permalink) |
| References | <ti3mV-2d9-3@gated-at.bofh.it> |
| 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=EyxoG/ciAjTEFJZqZdtg17eYdUcV/uRZQYp4OXIMR68=; b=gWjZpwflzsiMlIAdwpVD2mlShbfamZ0LvZbCWTlYpV+ma/xf/rqnEN2Ax7+UZ/8cst uxA9Ljd+1o7r2nO9pSk3/LUoJPnVfypPyasf2EIWjmlrDVKVMIBVCHhT+zHHYzeXqkkr vZTGDHqkiTeplDgizsidEAYcxCRp52bV8dtWuwxNtCqJeRCuaKAj7dNCRNZ2St/V3lEB uLkpLUjtF5qFqlna4a7F5H0WKvxF64QLAXQphLfyAite07bfArvLkqxo8fKlMhZRsxoj PZc5aobf0hXlSwlv84h8JRKfXLqUqZae/sjEG08rXNKUxOWQ3zHk9lHpDoIsD/kH4UUg 4/lg== |
| 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=EyxoG/ciAjTEFJZqZdtg17eYdUcV/uRZQYp4OXIMR68=; b=IO4MaQ/wa2gBru8SmAC3NGtHT/m9F2scjTzBlUe8FAcA/nyuZ8YW7EuWsoBaDKEhV6 wfdYjHEQzpSzeoczT8ihNOpuG5Anqipa1sKWh0seeoGdcEJsAtUXTuFOWcsKLYrAqYmQ rTSyuhHv9LddzR4ByUt+zfAoJ9adYGG8itNCtkarkG1EN0yioXQqV2fGcOC84GvsZTr5 zQ035GkT1FMq3VibTdr37tJ/FxHGtUZ/GhnO/khq2pSeTp+uLpFPQqslSiRlK+S12hWk 4byef3q9Y3UJ0NKgeu8t1EtHeUoskvB9tr+si39Sy2TQBYWyyZbyrNcGNnSUMp3Xi172 fUTA== |
| X-Gm-Message-State | AMke39lD4rxMSLea0msbdlawkgK76B8aLO9uhLDorTNbDka2v3OQ6P1pL3pXW+BfzUg8J6yc |
| X-Received | by 10.223.176.217 with SMTP id j25mr16277070wra.8.1488816023228; Mon, 06 Mar 2017 08:00:23 -0800 (PST) |
| X-Mailer | git-send-email 2.12.0.rc1.440.g5b76565f74-goog |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 62 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Andrey Konovalov <andreyknvl@google.com> |
| X-Original-Date | Mon, 6 Mar 2017 17:00:02 +0100 |
| X-Original-Message-ID | <37dfb2aed479ead0fba6b8795b4da89269d2c251.1488815789.git.andreyknvl@google.com> |
| X-Original-References | <cover.1488815789.git.andreyknvl@google.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1593493 |
Show key headers only | View raw
Unify KASAN report header format for different kinds of bad memory
accesses. Makes the code simpler.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
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);
}
--
2.12.0.rc1.440.g5b76565f74-goog
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/9] kasan: improve error reports Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 2/9] kasan: unify report headers Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 8/9] kasan: improve double-free report format Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 7/9] kasan: print page description after stacks Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 9/9] kasan: separate report parts by empty lines Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 1/9] kasan: introduce helper functions for determining bug type Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 6/9] kasan: improve slab object description Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 3/9] kasan: change allocation and freeing stack traces headers Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100 [PATCH v3 4/9] kasan: simplify address description logic Andrey Konovalov <andreyknvl@google.com> - 2017-03-06 17:10 +0100
csiph-web