From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1525800085; cv=none; d=google.com; s=arc-20160816; b=KU2XINRonDuXMmLRZSVQFPUlzehuryZYGX6CQA9smIrO9lIPIUIqCWd296dow/K0NG t8caG4JEX0plXhxjnJOxkmIHZ44NLt6Y6+m2XGRwi/K7e4dqXdW7AB6//vsde/aXEyM2 O6t4rji+SHXBXhGXMFWPix7WJXTXR1i+H2acfvev3SYlhNDuBBPDauI9BoN69Jize8MZ tDE7Lbr+5YK3rwpIOMNy0ocSguc6B1/gGS+rL8pkK6lILvNSrDq1hKkLeKkcHrAUSV4u +KnJtR9Eh7JD/lxUpTzS9EH6qnlWgQWoeOh/DYzgDEdq/dJwEsVI0SakTWp2K3hWz/2Q PRSA== 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=ICExutSsxMNmOeqM56Yn6CuSUfLXBAripkLnfwN846o=; b=Na0TDCPC8xtIu2WvXbsbhnfvBxI8OEQK62f7aTwR0f7EQo3Blrif9wSJWKqA07Zpzg A+mCFPgOtJapWYoJNTISogIrLRhuTa/sRC4cI0JRx4PlH7KQERj1zZRd3uK6RE7Wr9TO aH+fTV0AGGU6PyaOOU3QLU3YbEBI7bBltlxRyP3WnaZyeiyf7rAc7gSzXa9GKsB6ERUW QfKicJcdKAj9/PF0G/iNem5/oqb4gPPF4CEp0kV+SgEtqmP2Is4OsSm/YpymMDSbHdqg q6kl7PaCF7Mf79Dd5ZVkdcDissWOEP/BhUXVcjVG1SitTWnuB3hg8Yn9ZX5cDg6sIx/x JKNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=myWlVihh; 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=myWlVihh; 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: AB8JxZrvQ4RihxXsnVSNXvLckZjD5lH9GUaNW656fTUhjAji7v3XOkQKmJJQ9ikwECUJ0+h6f157zA== From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , Andrey Konovalov , Mark Rutland , Nick Desaulniers , Yury Norov , Marc Zyngier , Kristina Martsenko , Suzuki K Poulose , Punit Agrawal , Dave Martin , Ard Biesheuvel , James Morse , Michael Weiser , Julien Thierry , Tyler Baicar , "Eric W . Biederman" , Thomas Gleixner , Ingo Molnar , Kees Cook , Sandipan Das , David Woodhouse , Paul Lawrence , Herbert Xu , Josh Poimboeuf , Geert Uytterhoeven , Tom Lendacky , Arnd Bergmann , Dan Williams , Michal Hocko , Jan Kara , Ross Zwisler , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Matthew Wilcox , "Kirill A . Shutemov" , Souptick Joarder , Hugh Dickins , Davidlohr Bueso , Greg Kroah-Hartman , Philippe Ombredanne , Kate Stewart , Laura Abbott , Boris Brezillon , Vlastimil Babka , Pintu Agarwal , Doug Berger , Anshuman Khandual , Mike Rapoport , Mel Gorman , Pavel Tatashin , Tetsuo Handa , 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 , Kees Cook , Jann Horn , Mark Brand , Chintan Pandya Subject: [PATCH v1 07/16] khwasan, arm64: fix up fault handling logic Date: Tue, 8 May 2018 19:20:53 +0200 Message-Id: X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: References: In-Reply-To: References: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1599917350253870751?= X-GMAIL-MSGID: =?utf-8?q?1599917350253870751?= 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.441.gb46fe60e1d-goog