Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp5185606imm; Tue, 26 Jun 2018 07:16:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLwLIL76sPmMZE2KW/4fNYBeGOFkX8MKcIEZ5x2btNdoApX28wpo5iQzoTiHj/QRs5UC7yA X-Received: by 2002:a63:8e41:: with SMTP id k62-v6mr1532452pge.187.1530022601653; Tue, 26 Jun 2018 07:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022601; cv=none; d=google.com; s=arc-20160816; b=qYf0UBgt9KUchWFZwrLp19UgcKVw8Y7cKYHP9gl9xlvlu3WBNsfb+8uhyLl8E+ndnK w5aDeKDq4notJjen5C3T/HQI31FdF7lt0xMoN9NoHkA1tZs8ot/ONqFJIVvaD1lgCwgI P89XtkOihqBiPDfFW3HRNWyigBg230V98ispdFLTGIicaDrGP1VdW6KwhQH20levoMI4 Wo6zxDAbB8FIAM+QR9bBDRLI4fjePQjDPjD3MWJ0k0f5dR4qIGbrMlh1cqByXgdnZzNx h9Lwm8R+ScZGUzMZnkRAeFfiByiij4+XApnELLTYXNwwYlC/5csxMJ/LIu6MpvQ+vTA8 R+zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=EP2Dki4EWWZ2WEvc6M+bB9+4bOXHIe54Gcv4T4SHLRg=; b=W3dAV7lXRiSfw7E29n54AYn2VIxbW8nWMrp4O8n/dW2l+mk4iOzYC+kiwSVsjobTvh bjTpEV/L6KHnXjMb4DKaaPf8I67KO+A2ghvXFFT9ONY+zyOQLrJwv5c7Aer6qdAO52+Y K+l0LK4rtYuC9P88V3cQ3VSM4Km/ObtZHJJuzWW+yz7nXP9HB4YhK8yMhPFHUdlpTisU 5e2gY3OzSfZVk3ghJEglFldBIH5bcXYZdEZ6+AsO+Eo4kUejozAj3NHm31uw7HtdUOOb 0GFYXuNJwewMLZDbfyA2Mnk/a/FvIsyeOsJpEsfcbYuk6dz86+1qa00v7JSmYn07TTn9 VEEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=tP3T9GZT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t12-v6si2278275plz.4.2018.06.26.07.16.26; Tue, 26 Jun 2018 07:16:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=tP3T9GZT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965375AbeFZNRj (ORCPT + 99 others); Tue, 26 Jun 2018 09:17:39 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36746 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935565AbeFZNQA (ORCPT ); Tue, 26 Jun 2018 09:16:00 -0400 Received: by mail-wr0-f195.google.com with SMTP id f16-v6so17239873wrm.3 for ; Tue, 26 Jun 2018 06:16:00 -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; bh=EP2Dki4EWWZ2WEvc6M+bB9+4bOXHIe54Gcv4T4SHLRg=; b=tP3T9GZTcDl6sqUhST8VsnHchEalIHYPswEFU9VUy7f9t1zbWyFcTLdS0psY+d4o/v ANdg4IwZfzGL5HClnDgybjyli/txaY22L/ymiTvnVDZpW1HrKlHsQLWSIfsXpBJItKWN zo//HeueKsd5yERZIV1bDSpwQQa0iRqD6VlwduoonlUmoyuJEHEwNvpUM6QuSBP60Uir ts/hFjdrUyd1Ix8BBh8ZYP6xGFbbpSOWuYcCkYyfCZDnOvgeRqOdk/fNn30c6tqdVLpX X+PmiFnO/EFnY37ufjibH598VtfKS2SjQ++OW5uhG52javBmd+D4MiE6X6/yjqD8qe/Q MDqA== 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; bh=EP2Dki4EWWZ2WEvc6M+bB9+4bOXHIe54Gcv4T4SHLRg=; b=BLDeQFZ6uzclk/6VxU9l86P1WF6kmDlgJt+0DUTkFbXZtPyUuMQcPeH0W7quBxkAmB TiCtACqBm9CIVM3vTRrtCdDD+83rkXdJyE69/qk9YpYOeuXCzTUEt+lAlRf5npYRPJH3 4jx8jd3NcWCgTVS+EyGC4Y2BpJCndWTRBMotynS8sD2wCn0H6AY5m8CNPbOTmHrESeEB pIkZHdrN/JWa9qrdLYOSVC3Rcq/GnzoUxz+uvsk6+fuRdgmmpfuoU0GWG7RkiAw7b99f IIMOyRCBYlITMSiImT3gAPlhgo78tcPWYyffxWf2y4L4gfXsr7XKCPOVRYGLJpRJSafi yl5w== X-Gm-Message-State: APt69E1nVkrMrWUacNwEs6v8UNCgCiF3yKaJjk+BV8a+B6J1NiffDAYv WN1QZmPwzZI9U3lfe8jy22YXog== X-Received: by 2002:adf:81ca:: with SMTP id 68-v6mr1426498wra.44.1530018959149; Tue, 26 Jun 2018 06:15:59 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:58 -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 14/17] khwasan, arm64: add brk handler for inline instrumentation Date: Tue, 26 Jun 2018 15:15:24 +0200 Message-Id: <69fd53d114e5814020e5e265ae451a63b09c776e.1530018818.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org KHWASAN inline instrumentation mode (which embeds checks of shadow memory into the generated code, instead of inserting a callback) generates a brk instruction when a tag mismatch is detected. This commit add a KHWASAN brk handler, that decodes the immediate value passed to the brk instructions (to extract information about the memory access that triggered the mismatch), reads the register values (x0 contains the guilty address) and reports the bug. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/brk-imm.h | 2 + arch/arm64/kernel/traps.c | 69 +++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/brk-imm.h b/arch/arm64/include/asm/brk-imm.h index ed693c5bcec0..e4a7013321dc 100644 --- a/arch/arm64/include/asm/brk-imm.h +++ b/arch/arm64/include/asm/brk-imm.h @@ -16,10 +16,12 @@ * 0x400: for dynamic BRK instruction * 0x401: for compile time BRK instruction * 0x800: kernel-mode BUG() and WARN() traps + * 0x9xx: KHWASAN trap (allowed values 0x900 - 0x9ff) */ #define FAULT_BRK_IMM 0x100 #define KGDB_DYN_DBG_BRK_IMM 0x400 #define KGDB_COMPILED_DBG_BRK_IMM 0x401 #define BUG_BRK_IMM 0x800 +#define KHWASAN_BRK_IMM 0x900 #endif diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index d399d459397b..95152a4fd202 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -269,10 +270,14 @@ void arm64_notify_die(const char *str, struct pt_regs *regs, } } -void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size) +void __arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size) { regs->pc += size; +} +void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size) +{ + __arm64_skip_faulting_instruction(regs, size); /* * If we were single stepping, we want to get the step exception after * we return from the trap. @@ -791,7 +796,7 @@ static int bug_handler(struct pt_regs *regs, unsigned int esr) } /* If thread survives, skip over the BUG instruction and continue: */ - arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE); + __arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE); return DBG_HOOK_HANDLED; } @@ -801,6 +806,59 @@ static struct break_hook bug_break_hook = { .fn = bug_handler, }; +#ifdef CONFIG_KASAN_HW + +#define KHWASAN_ESR_RECOVER 0x20 +#define KHWASAN_ESR_WRITE 0x10 +#define KHWASAN_ESR_SIZE_MASK 0x0f +#define KHWASAN_ESR_SIZE(esr) (1 << ((esr) & KHWASAN_ESR_SIZE_MASK)) + +static int khwasan_handler(struct pt_regs *regs, unsigned int esr) +{ + bool recover = esr & KHWASAN_ESR_RECOVER; + bool write = esr & KHWASAN_ESR_WRITE; + size_t size = KHWASAN_ESR_SIZE(esr); + u64 addr = regs->regs[0]; + u64 pc = regs->pc; + + if (user_mode(regs)) + return DBG_HOOK_ERROR; + + kasan_report(addr, size, write, pc); + + /* + * The instrumentation allows to control whether we can proceed after + * a crash was detected. This is done by passing the -recover flag to + * the compiler. Disabling recovery allows to generate more compact + * code. + * + * Unfortunately disabling recovery doesn't work for the kernel right + * now. KHWASAN reporting is disabled in some contexts (for example when + * the allocator accesses slab object metadata; same is true for KASAN; + * this is controlled by current->kasan_depth). All these accesses are + * detected by the tool, even though the reports for them are not + * printed. + * + * This is something that might be fixed at some point in the future. + */ + if (!recover) + die("Oops - KHWASAN", regs, 0); + + /* If thread survives, skip over the brk instruction and continue: */ + __arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE); + return DBG_HOOK_HANDLED; +} + +#define KHWASAN_ESR_VAL (0xf2000000 | KHWASAN_BRK_IMM) +#define KHWASAN_ESR_MASK 0xffffff00 + +static struct break_hook khwasan_break_hook = { + .esr_val = KHWASAN_ESR_VAL, + .esr_mask = KHWASAN_ESR_MASK, + .fn = khwasan_handler, +}; +#endif + /* * Initial handler for AArch64 BRK exceptions * This handler only used until debug_traps_init(). @@ -808,6 +866,10 @@ static struct break_hook bug_break_hook = { int __init early_brk64(unsigned long addr, unsigned int esr, struct pt_regs *regs) { +#ifdef CONFIG_KASAN_HW + if ((esr & KHWASAN_ESR_MASK) == KHWASAN_ESR_VAL) + return khwasan_handler(regs, esr) != DBG_HOOK_HANDLED; +#endif return bug_handler(regs, esr) != DBG_HOOK_HANDLED; } @@ -815,4 +877,7 @@ int __init early_brk64(unsigned long addr, unsigned int esr, void __init trap_init(void) { register_break_hook(&bug_break_hook); +#ifdef CONFIG_KASAN_HW + register_break_hook(&khwasan_break_hook); +#endif } -- 2.18.0.rc2.346.g013aa6912e-goog