From patchwork Tue Jun 26 13:15:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10488925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 931CE601A0 for ; Tue, 26 Jun 2018 13:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 828132893B for ; Tue, 26 Jun 2018 13:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76C922893F; Tue, 26 Jun 2018 13:16:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC98D2893B for ; Tue, 26 Jun 2018 13:16:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55F5E6B0276; Tue, 26 Jun 2018 09:15:58 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 443286B0278; Tue, 26 Jun 2018 09:15:58 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BD7F6B0279; Tue, 26 Jun 2018 09:15:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id C53916B0276 for ; Tue, 26 Jun 2018 09:15:57 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id x6-v6so11169546wrl.6 for ; Tue, 26 Jun 2018 06:15:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=x7LgSHU71ZgD9Kw/P3WyW4fTO0KGuI1+HIz2YOw8Y6c=; b=XO+bIaow2lmcMuqo+mwUTZ3nNy9IXkvqmdSLvgj0nOloWFD/23JEBk9Ja1183VZ0VT mDcFj2tAmn8KGPXANLKp5Db5H4BbWrk4A6u+FcikSFevDUhikHCYhuPxf+u61j0LT7r4 e2Nvl+QQaZVeJvfE3M72ifdw4Pf18cXMOBErooNaVwRgr7249he0u04Q0XwMoxNYc4kM NEZYlS95wdB03Z3t2mVeMC+Fyh3E9QhU6t8ggh21idFVr08fwpPgpxGW+LS7efMXbFze yVSPGyg1w3RLmMcmDxQpSB48oKCUakVa37S6IK10nrfslNFnLfcUvMJ8D+u7AFH1JNLU HDsg== X-Gm-Message-State: APt69E1vVQso5XBehkepdA6R49ETb6vPYyO6rDbW0BUa8q+CKzGHwrQE k116dUcc9jyg7B98z/XrFc9SeZyk6U79lM4VZtRKFaUHIUIpuyQFtqkfGqKJTNuJX5kOzSLWyw6 hyhEaMTz/X387dQhywanUmYcCm7UJV807GJKoPR57iEY0UrVl3zuYcGBfuTpBQj97T0yDEkigNq ghm6Avt9i3vEATq8Ci5vz2M0cAk2dMUnT/W0vLLbWmgZzFnlaSrcHJrSSodV0MJOUduQR0rxSfM VllDMHMSCDwnDBIS3klH6F8bIjsWu/Ly3mRWKhO0Bhw35fy5l6PEp2p34gTxsWs0c1Ce4B7NyX2 qsv5/LdilLIsb9UWoXp1Y1Q+7w9338HnvC8XA+Ek5btv7QKa5R+6i76lmE+uhPn6Ovt8ZYj2jpv F X-Received: by 2002:adf:8131:: with SMTP id 46-v6mr1426333wrm.135.1530018957368; Tue, 26 Jun 2018 06:15:57 -0700 (PDT) X-Received: by 2002:adf:8131:: with SMTP id 46-v6mr1426281wrm.135.1530018956414; Tue, 26 Jun 2018 06:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530018956; cv=none; d=google.com; s=arc-20160816; b=dn0dnMy25ziXhhxGcUmfscGkE/DZtodVBjepI/XCec0s5kpl7zM2UMh8c+jXGqh5EO krDIi7CZCfuc9NZjqaKqMWKdR+4uSZKh77C6NfEor/s5kYb9DZcoLwQudqPeuJxqClED 6sE+nTf5zfJNv0b1/0D6iCcCad3S+uJSc2NxSvKOS5SNy1YwG3WoNiZpqwdV8jXUd28Z +CTyu6SbPsgDn/ZlBuACe8J0ObXu3xalfER0ue2qiwRi5NJ3Yv5wC5hgPTeL5vjsvLhu D5fkskLtDumdjWrPNIKoWf0gTB18V8xJ1npcemBp2MgK2k7UNrulmCMLguHKgBJmczfU qS9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=x7LgSHU71ZgD9Kw/P3WyW4fTO0KGuI1+HIz2YOw8Y6c=; b=QvuMxg4czp55OuZc+1W0vJOvnV+SbZiF8oJjVj84dl4kI6vL01/c2kR3ZGH4kQk3Wg 20HhFvvaaNnODZgmrgT+R31lN7x9ytM6HExvQzVwvqeBm3KLdxi5idN8YRBIITaDz+4X ZRtldAU0s+8sVwdSzPAwI1S2cxRUWEbL+eyp4IFfFyQAaAQIOmZJVKYuOTYuZTbezwXm xDAxPe2wKzmzfbv7CRhYVrnK1Eq/QNfCB7mS7B+HB542lnWo+pBzrt+r4wHt7gQ6T2iL laag3Vv9NcFshB1ripdYe8b/gI0xuELiyvWApRQ52Zn7/7xq8OtbbtDZ8rKw283GSMcF rIsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=PvQju4Eo; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k1-v6sor628944wmd.62.2018.06.26.06.15.56 for (Google Transport Security); Tue, 26 Jun 2018 06:15:56 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=PvQju4Eo; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com 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; bh=x7LgSHU71ZgD9Kw/P3WyW4fTO0KGuI1+HIz2YOw8Y6c=; b=PvQju4EoC02gWNWypHB1WVME32+6VN3JOj6cEONl0f/gm4TOUdhuUBFEMtev/HqM7G zGP3FXESuIask7f5/+J4+E5WyACgh7NJcC6/2iRh55jS0WIjNhCWIChj6MGHxtJndici 7A+7WSNVGkVDvPFz1npDJYnUDAq8cTZotdngPB2mHqIDAXkSvChYguYfZ2oDYTNVyS1O Nihi6kyKUEXGEJ7rqsWz7VnbxVNhy4NCT5d7ox17ozgSsTHHKz4WEq6AM/ioy1Z6UMbv 9Z6/7kN7LFXTk0UXXPOzfAB6l3eB2LkfMpfSqbUX97i4ODvPnv5HYvUoBn5ClhUOXTXo gbrA== X-Google-Smtp-Source: AAOMgpcCPD6tKB2C6xmWvogDyu4Ng1HIod306Ojol668U6f0tl3vpiAFXzfCzzP597968CyvfHdUzg== X-Received: by 2002:a1c:29c5:: with SMTP id p188-v6mr1566476wmp.45.1530018955522; Tue, 26 Jun 2018 06:15:55 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id w15-v6sm2162639wrn.25.2018.06.26.06.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:54 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Andrey Konovalov Subject: [PATCH v4 12/17] khwasan: add bug reporting routines Date: Tue, 26 Jun 2018 15:15:22 +0200 Message-Id: X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 --- include/linux/kasan.h | 3 +++ mm/kasan/kasan.h | 7 +++++ mm/kasan/kasan_report.c | 7 ++--- mm/kasan/khwasan_report.c | 21 +++++++++++++++ mm/kasan/report.c | 57 +++++++++++++++++++++------------------ 5 files changed, 64 insertions(+), 31 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index d7624b879d86..e209027f3b52 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 kasan_report(unsigned long addr, size_t size, + bool write, unsigned long ip); + #else /* CONFIG_KASAN_HW */ static inline void khwasan_init(void) { } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 82672473740c..d60859d26be7 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -119,8 +119,15 @@ void kasan_poison_shadow(const void *address, size_t size, u8 value); void check_memory_region(unsigned long addr, size_t size, bool write, unsigned long ret_ip); +void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); +#ifdef CONFIG_KASAN_HW +void print_tags(u8 addr_tag, const void *addr); +#else +static inline void print_tags(u8 addr_tag, const void *addr) { } +#endif + void kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip); void kasan_report_invalid_free(void *object, unsigned long ip); diff --git a/mm/kasan/kasan_report.c b/mm/kasan/kasan_report.c index 2d8decbecbd5..fdf2d77e3125 100644 --- a/mm/kasan/kasan_report.c +++ b/mm/kasan/kasan_report.c @@ -33,10 +33,10 @@ #include "kasan.h" #include "../slab.h" -static const void *find_first_bad_addr(const void *addr, size_t size) +void *find_first_bad_addr(void *addr, size_t size) { u8 shadow_val = *(u8 *)kasan_mem_to_shadow(addr); - const void *first_bad_addr = addr; + void *first_bad_addr = addr; while (!shadow_val && first_bad_addr < addr + size) { first_bad_addr += KASAN_SHADOW_SCALE_SIZE; @@ -50,9 +50,6 @@ static const char *get_shadow_bug_type(struct kasan_access_info *info) const char *bug_type = "unknown-crash"; u8 *shadow_addr; - info->first_bad_addr = find_first_bad_addr(info->access_addr, - info->access_size); - shadow_addr = (u8 *)kasan_mem_to_shadow(info->first_bad_addr); /* diff --git a/mm/kasan/khwasan_report.c b/mm/kasan/khwasan_report.c index 2edbc3c76be5..51238b404b08 100644 --- a/mm/kasan/khwasan_report.c +++ b/mm/kasan/khwasan_report.c @@ -37,3 +37,24 @@ const char *get_bug_type(struct kasan_access_info *info) { return "invalid-access"; } + +void *find_first_bad_addr(void *addr, size_t size) +{ + u8 tag = get_tag(addr); + void *untagged_addr = reset_tag(addr); + u8 *shadow = (u8 *)kasan_mem_to_shadow(untagged_addr); + 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 print_tags(u8 addr_tag, const void *addr) +{ + u8 *shadow = (u8 *)kasan_mem_to_shadow(addr); + + pr_err("Pointer tag: [%02x], memory tag: [%02x]\n", addr_tag, *shadow); +} diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 155247a6f8a8..e031c78f2e52 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -64,11 +64,10 @@ static int __init kasan_set_multi_shot(char *str) } __setup("kasan_multi_shot", kasan_set_multi_shot); -static void print_error_description(struct kasan_access_info *info, - const char *bug_type) +static void print_error_description(struct kasan_access_info *info) { pr_err("BUG: KASAN: %s in %pS\n", - bug_type, (void *)info->ip); + get_bug_type(info), (void *)info->ip); pr_err("%s of size %zu at addr %px by task %s/%d\n", info->is_write ? "Write" : "Read", info->access_size, info->access_addr, current->comm, task_pid_nr(current)); @@ -272,6 +271,8 @@ void kasan_report_invalid_free(void *object, unsigned long ip) start_report(&flags); pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip); + print_tags(get_tag(object), reset_tag(object)); + object = reset_tag(object); pr_err("\n"); print_address_description(object); pr_err("\n"); @@ -279,41 +280,45 @@ void kasan_report_invalid_free(void *object, unsigned long ip) end_report(&flags); } -static void kasan_report_error(struct kasan_access_info *info) -{ - unsigned long flags; - - start_report(&flags); - - print_error_description(info, get_bug_type(info)); - pr_err("\n"); - - if (!addr_has_shadow(info->access_addr)) { - dump_stack(); - } else { - print_address_description((void *)info->access_addr); - pr_err("\n"); - print_shadow_for_address(info->first_bad_addr); - } - - end_report(&flags); -} - void kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip) { struct kasan_access_info info; + void *tagged_addr; + void *untagged_addr; + unsigned long flags; if (likely(!report_enabled())) return; disable_trace_on_warning(); - info.access_addr = (void *)addr; - info.first_bad_addr = (void *)addr; + tagged_addr = (void *)addr; + untagged_addr = reset_tag(tagged_addr); + + info.access_addr = tagged_addr; + if (addr_has_shadow(untagged_addr)) + info.first_bad_addr = find_first_bad_addr(tagged_addr, size); + else + info.first_bad_addr = untagged_addr; info.access_size = size; info.is_write = is_write; info.ip = ip; - kasan_report_error(&info); + start_report(&flags); + + print_error_description(&info); + if (addr_has_shadow(untagged_addr)) + print_tags(get_tag(tagged_addr), info.first_bad_addr); + pr_err("\n"); + + if (addr_has_shadow(untagged_addr)) { + print_address_description(untagged_addr); + pr_err("\n"); + print_shadow_for_address(info.first_bad_addr); + } else { + dump_stack(); + } + + end_report(&flags); }