From: Andrey Konovalov <andreyknvl@google.com>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Christoffer Dall <christoffer.dall@linaro.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Christopher Li <sparse@chrisli.org>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
"GitAuthor : Andrey Konovalov" <andreyknvl@google.com>,
Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Yury Norov <ynorov@caviumnetworks.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Punit Agrawal <punit.agrawal@arm.com>,
Dave Martin <Dave.Martin@arm.com>,
Michael Weiser <michael.weiser@gmx.de>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry@arm.com>,
Steve Capper <steve.capper@arm.com>,
Tyler Baicar <tbaicar@codeaurora.org>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Stephen Boyd <stephen.boyd@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Paul Lawrence <paullawrence@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
David Woodhouse <dwmw@amazon.co.uk>,
Sandipan Das <sandipan@linux.vnet.ibm.com>,
Kees Cook <keescook@chromium.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
kasan-dev@googlegroups.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-sparse@vger.kernel.org,
linux-mm@kvack.org, linux-kbuild@vger.kernel.org
Cc: Kostya Serebryany <kcc@google.com>,
Evgeniy Stepanov <eugenis@google.com>,
Lee Smith <Lee.Smith@arm.com>,
Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>,
Jacob Bramley <Jacob.Bramley@arm.com>,
Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>,
Kees Cook <keescook@google.com>, Jann Horn <jannh@google.com>,
Mark Brand <markbrand@google.com>
Subject: [RFC PATCH v2 12/15] khwasan: add bug reporting routines
Date: Fri, 23 Mar 2018 19:05:48 +0100 [thread overview]
Message-ID: <1ebd9c89a812711429ff6d38c1672255d860228b.1521828274.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1521828273.git.andreyknvl@google.com>
In-Reply-To: <cover.1521828273.git.andreyknvl@google.com>
This commit adds rountines, that print KHWASAN error reports. Those are
quite similar to KASAN, the difference is:
1. The way KHWASAN finds the first bad shadow cell (with a mismatching
tag). KHWASAN compares memory tags from the shadow memory to the pointer
tag.
2. KHWASAN reports all bugs with the "KASAN: invalid-access" header. This
is done, so various external tools that already parse the kernel logs
looking for KASAN reports wouldn't need to be changed.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
include/linux/kasan.h | 3 ++
mm/kasan/report.c | 88 ++++++++++++++++++++++++++++++++++++++-----
2 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index a2869464a8be..54e7c437dc8f 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -161,6 +161,9 @@ void *khwasan_set_tag(const void *addr, u8 tag);
u8 khwasan_get_tag(const void *addr);
void *khwasan_reset_tag(const void *ptr);
+void khwasan_report(unsigned long addr, size_t size, bool write,
+ unsigned long ip);
+
#else /* CONFIG_KASAN_TAGS */
static inline void khwasan_init(void) { }
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 5c169aa688fd..ed17168a083e 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -51,10 +51,9 @@ static const void *find_first_bad_addr(const void *addr, size_t size)
return first_bad_addr;
}
-static bool addr_has_shadow(struct kasan_access_info *info)
+static bool addr_has_shadow(const void *addr)
{
- return (info->access_addr >=
- kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
+ return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
}
static const char *get_shadow_bug_type(struct kasan_access_info *info)
@@ -127,15 +126,14 @@ static const char *get_wild_bug_type(struct kasan_access_info *info)
static const char *get_bug_type(struct kasan_access_info *info)
{
- if (addr_has_shadow(info))
+ if (addr_has_shadow(info->access_addr))
return get_shadow_bug_type(info);
return get_wild_bug_type(info);
}
-static void print_error_description(struct kasan_access_info *info)
+static void print_error_description(struct kasan_access_info *info,
+ const char *bug_type)
{
- const char *bug_type = get_bug_type(info);
-
pr_err("BUG: KASAN: %s in %pS\n",
bug_type, (void *)info->ip);
pr_err("%s of size %zu at addr %px by task %s/%d\n",
@@ -345,10 +343,10 @@ static void kasan_report_error(struct kasan_access_info *info)
kasan_start_report(&flags);
- print_error_description(info);
+ print_error_description(info, get_bug_type(info));
pr_err("\n");
- if (!addr_has_shadow(info)) {
+ if (!addr_has_shadow(info->access_addr)) {
dump_stack();
} else {
print_address_description((void *)info->access_addr);
@@ -412,6 +410,78 @@ void kasan_report(unsigned long addr, size_t size,
kasan_report_error(&info);
}
+static inline void khwasan_print_tags(const void *addr)
+{
+ u8 addr_tag = get_tag(addr);
+ void *untagged_addr = reset_tag(addr);
+ u8 *shadow = (u8 *)kasan_mem_to_shadow(untagged_addr);
+
+ pr_err("Pointer tag: [%02x], memory tag: [%02x]\n", addr_tag, *shadow);
+}
+
+static const void *khwasan_find_first_bad_addr(const void *addr, size_t size)
+{
+ u8 tag = get_tag((void *)addr);
+ void *untagged_addr = reset_tag((void *)addr);
+ u8 *shadow = (u8 *)kasan_mem_to_shadow(untagged_addr);
+ const void *first_bad_addr = untagged_addr;
+
+ while (*shadow == tag && first_bad_addr < untagged_addr + size) {
+ first_bad_addr += KASAN_SHADOW_SCALE_SIZE;
+ shadow = (u8 *)kasan_mem_to_shadow(first_bad_addr);
+ }
+ return first_bad_addr;
+}
+
+void khwasan_report(unsigned long addr, size_t size, bool write,
+ unsigned long ip)
+{
+ struct kasan_access_info info;
+ unsigned long flags;
+ void *untagged_addr = reset_tag((void *)addr);
+
+ if (likely(!kasan_report_enabled()))
+ return;
+
+ disable_trace_on_warning();
+
+ info.access_addr = (void *)addr;
+ info.first_bad_addr = khwasan_find_first_bad_addr((void *)addr, size);
+ info.access_size = size;
+ info.is_write = write;
+ info.ip = ip;
+
+ kasan_start_report(&flags);
+
+ print_error_description(&info, "invalid-access");
+ khwasan_print_tags((void *)addr);
+ pr_err("\n");
+
+ if (!addr_has_shadow(untagged_addr)) {
+ dump_stack();
+ } else {
+ print_address_description(untagged_addr);
+ pr_err("\n");
+ print_shadow_for_address(info.first_bad_addr);
+ }
+
+ kasan_end_report(&flags);
+}
+
+void khwasan_report_invalid_free(void *object, unsigned long ip)
+{
+ unsigned long flags;
+ void *untagged_addr = reset_tag((void *)object);
+
+ kasan_start_report(&flags);
+ pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip);
+ khwasan_print_tags(object);
+ pr_err("\n");
+ print_address_description(untagged_addr);
+ pr_err("\n");
+ print_shadow_for_address(untagged_addr);
+ kasan_end_report(&flags);
+}
#define DEFINE_ASAN_REPORT_LOAD(size) \
void __asan_report_load##size##_noabort(unsigned long addr) \
--
2.17.0.rc0.231.g781580f067-goog
next prev parent reply other threads:[~2018-03-23 18:05 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 18:05 [RFC PATCH v2 00/15] khwasan: kernel hardware assisted address sanitizer Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 01/15] khwasan, mm: change kasan hooks signatures Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 02/15] khwasan: move common kasan and khwasan code to common.c Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 03/15] khwasan: add CONFIG_KASAN_CLASSIC and CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-24 8:43 ` Ingo Molnar
2018-03-27 16:23 ` Andrey Konovalov
2018-03-27 20:02 ` Ingo Molnar
2018-03-23 18:05 ` [RFC PATCH v2 04/15] khwasan, arm64: adjust shadow size for CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 05/15] khwasan: initialize shadow to 0xff Andrey Konovalov
2018-03-30 16:07 ` Andrey Ryabinin
2018-04-03 14:43 ` Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 06/15] khwasan, arm64: untag virt address in __kimg_to_phys Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 07/15] khwasan, arm64: fix up fault handling logic Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 08/15] khwasan: add tag related helper functions Andrey Konovalov
2018-03-30 16:13 ` Andrey Ryabinin
2018-04-03 14:45 ` Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 09/15] khwasan, kvm: untag pointers in kern_hyp_va Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 10/15] khwasan, arm64: enable top byte ignore for the kernel Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 11/15] khwasan, mm: perform untagged pointers comparison in krealloc Andrey Konovalov
2018-03-24 8:29 ` Ingo Molnar
2018-03-27 12:20 ` Andrey Konovalov
2018-03-27 20:01 ` Ingo Molnar
2018-03-23 18:05 ` Andrey Konovalov [this message]
2018-03-23 18:05 ` [RFC PATCH v2 13/15] khwasan: add hooks implementation Andrey Konovalov
2018-03-30 17:47 ` Andrey Ryabinin
2018-04-03 14:59 ` Andrey Konovalov
2018-04-04 12:39 ` Andrey Ryabinin
2018-04-04 17:00 ` Andrey Konovalov
2018-04-05 13:02 ` Andrey Ryabinin
2018-04-06 12:14 ` Andrey Konovalov
2018-04-06 12:27 ` Andrey Ryabinin
2018-04-10 16:07 ` Andrey Konovalov
2018-04-10 16:31 ` Andrey Ryabinin
2018-04-12 16:45 ` Andrey Konovalov
2018-04-12 17:20 ` Andrey Ryabinin
2018-04-12 17:37 ` Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 14/15] khwasan, arm64: add brk handler for inline instrumentation Andrey Konovalov
2018-03-23 18:05 ` [RFC PATCH v2 15/15] khwasan: update kasan documentation Andrey Konovalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ebd9c89a812711429ff6d38c1672255d860228b.1521828274.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Dave.Martin@arm.com \
--cc=Jacob.Bramley@arm.com \
--cc=Lee.Smith@arm.com \
--cc=Ramana.Radhakrishnan@arm.com \
--cc=Ruben.Ayrapetyan@arm.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=dwmw@amazon.co.uk \
--cc=ebiederm@xmission.com \
--cc=eugenis@google.com \
--cc=geert@linux-m68k.org \
--cc=glider@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=iamjoonsoo.kim@lge.com \
--cc=james.morse@arm.com \
--cc=jannh@google.com \
--cc=jpoimboe@redhat.com \
--cc=julien.thierry@arm.com \
--cc=kasan-dev@googlegroups.com \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=keescook@google.com \
--cc=kristina.martsenko@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-sparse@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=markbrand@google.com \
--cc=michael.weiser@gmx.de \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paullawrence@google.com \
--cc=penberg@kernel.org \
--cc=punit.agrawal@arm.com \
--cc=rientjes@google.com \
--cc=sandipan@linux.vnet.ibm.com \
--cc=sparse@chrisli.org \
--cc=stephen.boyd@linaro.org \
--cc=steve.capper@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tbaicar@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
--cc=ynorov@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).