From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1524235631; cv=none; d=google.com; s=arc-20160816; b=yDol960S6XwoRhSFY/gksYhnBmTmmTxPE9XMUDPeMLvAo7LX4nZxw/bneNi7zFEvzn yUX5XyfCPOT+pVTIj9YGoIbXlhho3+ldE87Df5K/HSP1PVALFfIngs1auOipVTqTr3TH /++x3MKI2AFzsy2CtOkcgarTPSj9lBadSopMK8vrcm48oWcqfXp1+eDIKj9XQfe15bsY XVVPIDPGC/0IxjwRHpO4HdbsvkPDOHBQ+yhB51IZsApwuqKDJWHuPooZYLOcFPqPd+94 f1e1e/GFsTLeEhY1WgMF9sznfQnW8lqrXr0+Vz0NPmRLi9z3rUCDgnv+cQo6gJnTvLjc LT0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=cKLqaioCn68SkR/RKsa9TUc3eioBgTB5cuxjcyT4QJI=; b=UIOWUU4XzGbHQzE1ARrpJYf355yCHxrJtSypy6qUd85xmb/MYHiiSO+vU9k0j9RXNO OZEPuo5yA4uKY9ThP9uImCRCPYquXFxkq2DWHp3eLhU9ev/ps6bcZ5b2hBCs9u5ET43z 1IxgMutxx3qHXaVUk711l9VGC6XT0yT87V3jZBQdHDlyyPaek+TrzWn+X5wYf6uUlRKS KOgntdfr9LT5Qe5yrpGLaSwXswJEbn85rXvsJqFzyRkN/QVNzWpWglZ4n5xJCBcnl2c6 bqRpNITzVwEaQbxsOJYq8c+jg6B7Ezjnu29XTLJanRZOSoo0rLYbzXwBgtus41UaJnD/ dl2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=B0Ew6ozf; 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 Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=B0Ew6ozf; 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 X-Google-Smtp-Source: AIpwx4/p42bwPuiFvpYLQ+P6NE2r134lBnQUaP67oI9eTyVJ3WSVOfbL0+BM9Om9I6qbvC/xDl0Cnw== From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Marc Zyngier , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , "GitAuthor : Andrey Konovalov" , Mark Rutland , Ard Biesheuvel , Yury Norov , Nick Desaulniers , Suzuki K Poulose , Kristina Martsenko , Punit Agrawal , Dave Martin , Michael Weiser , James Morse , Julien Thierry , Steve Capper , Tyler Baicar , "Eric W . Biederman" , Thomas Gleixner , Ingo Molnar , Paul Lawrence , Greg Kroah-Hartman , David Woodhouse , Sandipan Das , Kees Cook , Herbert Xu , Geert Uytterhoeven , Josh Poimboeuf , Arnd Bergmann , 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 , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Kees Cook , Jann Horn , Mark Brand Subject: [RFC PATCH v3 06/15] khwasan, arm64: fix up fault handling logic Date: Fri, 20 Apr 2018 16:46:44 +0200 Message-Id: <4aaaba7c1788004c1cb654787f005efbe47eca6a.1524235387.git.andreyknvl@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog In-Reply-To: References: In-Reply-To: References: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1598276900868330624?= X-GMAIL-MSGID: =?utf-8?q?1598276900868330624?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: show_pte in arm64 fault handling relies on the fact that the top byte of a kernel pointer is 0xff, which isn't always the case with KHWASAN enabled. Reset the top byte. Signed-off-by: Andrey Konovalov --- arch/arm64/mm/fault.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 4165485e8b6e..e834fe76f5d2 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,8 @@ void show_pte(unsigned long addr) pgd_t *pgdp; pgd_t pgd; + addr = (unsigned long)khwasan_reset_tag((void *)addr); + if (addr < TASK_SIZE) { /* TTBR0 */ mm = current->active_mm; -- 2.17.0.484.g0c8726318c-goog